From 5a82328b377436d2cc7f84f60d0576300817bf87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 1 Dec 2021 17:38:47 +0100 Subject: [PATCH] feat: make work with 21.11 --- .gitmodules | 3 +++ .versions/nur.json | 10 --------- .versions/stockholm.json | 11 +++++----- configs/cloud.nix | 28 ++++++++++++------------- configs/default.nix | 15 ++++++++++---- configs/flix.nix | 2 +- configs/networkmanager.nix | 4 ---- configs/packages/default.nix | 6 ++---- configs/packages/python.nix | 8 ++++---- configs/packages/writing.nix | 2 +- configs/rofi.nix | 40 ------------------------------------ deploy.nix | 1 - packages/scripts/default.nix | 7 ++++--- shell.nix | 7 +------ submodules/nur-packages | 1 + 15 files changed, 47 insertions(+), 98 deletions(-) delete mode 100644 .versions/nur.json create mode 160000 submodules/nur-packages diff --git a/.gitmodules b/.gitmodules index 313f563..9e08915 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "submodules/menstruation-backend"] path = submodules/menstruation-backend url = https://github.com/kmein/menstruation.rs +[submodule "submodules/nur-packages"] + path = submodules/nur-packages + url = git@github.com:kmein/nur-packages.git diff --git a/.versions/nur.json b/.versions/nur.json deleted file mode 100644 index 427c301..0000000 --- a/.versions/nur.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "url": "https://github.com/nix-community/NUR", - "rev": "cb690d40a9aa790de23c6732c0df93b7c7db0960", - "date": "2021-12-01T05:48:36+00:00", - "path": "/nix/store/jwshb7n39nq6c9cnjcfhggcps6sivisk-NUR", - "sha256": "0z1zshhq3fn4kfz0kpjmcidlz9yrbdqlyyh65gy8vdybgq4qb9mg", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/.versions/stockholm.json b/.versions/stockholm.json index e18b633..e9abe32 100644 --- a/.versions/stockholm.json +++ b/.versions/stockholm.json @@ -1,9 +1,10 @@ { - "url": "https://cgit.krebsco.de/stockholm", - "rev": "948584f291627d35d6da2f41704fd19adc4dbdde", - "date": "2021-11-30T22:09:06+01:00", - "path": "/nix/store/2flcfbbdhd8bjyw9jca4qs30br5i2s14-stockholm", - "sha256": "194r2w13rj030hvqb735zpf907y1jja9z3sffnxkyxgs3wwy1qih", + "url": "https://cgit.lassul.us/stockholm", + "rev": "b79f5ab97db8115c4b2e66e57bb84587a31ce1e0", + "date": "2021-11-30T23:09:27+01:00", + "path": "/nix/store/ng83hpfszfnm3d80i5kv50qgqqsqgkrj-stockholm", + "sha256": "0g70jzya62nw3w6vwjdddn2i9hlm8r1d1f1wnl2bzibwx6p97bp6", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/configs/cloud.nix b/configs/cloud.nix index f12b79e..e7b958a 100644 --- a/configs/cloud.nix +++ b/configs/cloud.nix @@ -44,21 +44,19 @@ openDefaultPorts = true; configDir = "/home/kfm/.config/syncthing"; dataDir = "/home/kfm/.config/syncthing"; - declarative = rec { - cert = toString ; - key = toString ; - inherit ((import ).syncthing) devices; - folders = - let cloud-dir = "${config.users.users.me.home}/cloud"; - in { - "${cloud-dir}/syncthing/common".devices = [ "kabsa" "manakish" ]; - "${cloud-dir}/syncthing/library".devices = [ "kabsa" "manakish" "heym" ]; - "${cloud-dir}/syncthing/mundoiu".devices = [ "kabsa" "manakish" "heym" ]; - "${cloud-dir}/syncthing/music" = { - devices = [ "kabsa" "manakish" "heym" "zaatar" ]; - id = "music"; - }; + cert = toString ; + key = toString ; + inherit ((import ).syncthing) devices; + folders = + let cloud-dir = "${config.users.users.me.home}/cloud"; + in { + "${cloud-dir}/syncthing/common".devices = [ "kabsa" "manakish" ]; + "${cloud-dir}/syncthing/library".devices = [ "kabsa" "manakish" "heym" ]; + "${cloud-dir}/syncthing/mundoiu".devices = [ "kabsa" "manakish" "heym" ]; + "${cloud-dir}/syncthing/music" = { + devices = [ "kabsa" "manakish" "heym" "zaatar" ]; + id = "music"; }; - }; + }; }; } diff --git a/configs/default.nix b/configs/default.nix index f87a557..d79a369 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -15,13 +15,11 @@ in { "nixpkgs-overlays=${toString ../overlays}" ]; } - { services.dbus.packages = [ pkgs.gnome3.dconf ]; } { nixpkgs = { config = { allowUnfree = true; packageOverrides = pkgs: { - nur = import { inherit pkgs; }; writeDashBin = pkgs.writers.writeDashBin; writeDash = pkgs.writers.writeDash; gfs-fonts = pkgs.callPackage {}; @@ -67,6 +65,7 @@ in { }; home-manager.users.me.xdg.enable = true; + home-manager.users.me.dconf.enable = false; } { sound.enable = true; @@ -161,8 +160,16 @@ in { } { security.wrappers = { - pmount.source = "${pkgs.pmount}/bin/pmount"; - pumount.source = "${pkgs.pmount}/bin/pumount"; + pmount = { + owner = config.users.users.me.name; + group = "users"; + source = "${pkgs.pmount}/bin/pmount"; + }; + pumount = { + owner = config.users.users.me.name; + group = "users"; + source = "${pkgs.pmount}/bin/pumount"; + }; }; } { programs.command-not-found.enable = true; } diff --git a/configs/flix.nix b/configs/flix.nix index ac43d83..82490e4 100644 --- a/configs/flix.nix +++ b/configs/flix.nix @@ -51,7 +51,7 @@ in { isSystemUser = true; createHome = true; home = cacheLocation; - extraGroups = [ flixGroup ]; + group = flixGroup; }; environment.systemPackages = [ diff --git a/configs/networkmanager.nix b/configs/networkmanager.nix index 1fd9f47..0145096 100644 --- a/configs/networkmanager.nix +++ b/configs/networkmanager.nix @@ -96,9 +96,5 @@ in }; }; - networking.networkmanager.dispatcherScripts = [ - { source = "${pkgs.nur.repos.makefu.prison-break}/bin/prison-break"; } - ]; - environment.systemPackages = [ pkgs.speedtest-cli ]; } diff --git a/configs/packages/default.nix b/configs/packages/default.nix index 46d20de..f775738 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -52,7 +52,6 @@ in { wget whois ix - nur.repos.kmein.python3Packages.instaloader dnsutils # mtr # my traceroute # FILE MANAGERS @@ -133,10 +132,9 @@ in { scripts.devanagari scripts.betacode # ancient greek betacode to unicode converter scripts.meteo - nur.repos.kmein.mahlzeit + scripts.mahlzeit recht - # nur.repos.kmein.slide - nur.repos.kmein.vimv + scripts.vimv scripts.swallow # window swallowing scripts.genius scripts.instaget diff --git a/configs/packages/python.nix b/configs/packages/python.nix index 55ff85a..21b091e 100644 --- a/configs/packages/python.nix +++ b/configs/packages/python.nix @@ -2,10 +2,10 @@ environment.systemPackages = [ (pkgs.python3.withPackages (py: [ py.black - py.python-language-server - py.pyls-mypy - py.pyls-black - py.pyls-isort + # py.python-language-server + # py.pyls-mypy + # py.pyls-black + # py.pyls-isort py.flake8 py.pygments py.schema diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix index b106e53..61de42d 100644 --- a/configs/packages/writing.nix +++ b/configs/packages/writing.nix @@ -63,7 +63,7 @@ in { latexrun (aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ])) # haskellPackages.pandoc-citeproc - nur.repos.kmein.text2pdf + scripts.text2pdf lowdown glow # markdown to term libreoffice diff --git a/configs/rofi.nix b/configs/rofi.nix index de6dcfa..40bc179 100644 --- a/configs/rofi.nix +++ b/configs/rofi.nix @@ -4,46 +4,6 @@ let in{ home-manager.users.me.programs.rofi = { enable = true; - separator = "solid"; - scrollbar = false; - borderWidth = 0; - lines = 5; font = "Monospace 10"; - colors = rec { - window = rec { - background = colours.foreground; - border = background; - separator = colours.black.bright; - }; - rows = { - normal = { - background = window.background; - backgroundAlt = window.background; - foreground = colours.background; - highlight = { - foreground = colours.cyan.dark; - inherit (window) background; - }; - }; - active = { - background = window.background; - backgroundAlt = window.background; - foreground = colours.yellow.dark; - highlight = { - foreground = colours.green.dark; - inherit (window) background; - }; - }; - urgent = { - background = window.background; - backgroundAlt = window.background; - foreground = colours.red.dark; - highlight = { - foreground = colours.magenta.dark; - inherit (window) background; - }; - }; - }; - }; }; } diff --git a/deploy.nix b/deploy.nix index 3f7968a..7ef9bca 100644 --- a/deploy.nix +++ b/deploy.nix @@ -23,7 +23,6 @@ let home-manager.git = gitFromJson .versions/home-manager.json; stockholm.git = gitFromJson .versions/stockholm.json; retiolum.git = gitFromJson .versions/retiolum.json; - nur.git = gitFromJson .versions/nur.json; nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json; system-secrets.pass = { dir = toString ~/.password-store; diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix index a6e4032..fe8b870 100644 --- a/packages/scripts/default.nix +++ b/packages/scripts/default.nix @@ -1,5 +1,6 @@ { pkgs, lib, ... }: let + nur = import {}; kpaste = pkgs.callPackage { }; wrapScript = { packages ? [ ], name, script }: pkgs.writers.writeDashBin name '' @@ -95,7 +96,7 @@ in rec { ''; tag = wrapScript { - packages = [ pkgs.vorbisTools pkgs.python3Packages.eyeD3 pkgs.nur.repos.kmein.opustags ]; + packages = [ pkgs.vorbisTools pkgs.python3Packages.eyeD3 nur.opustags ]; script = "${voidrice}/.local/bin/tag"; name = "tag"; }; @@ -293,7 +294,7 @@ in rec { ''; betacode = pkgs.writers.writePython3Bin "betacode" { - libraries = [ pkgs.nur.repos.kmein.python3Packages.betacode ]; + libraries = [ nur.python3Packages.betacode ]; } '' import betacode.conv import sys @@ -402,4 +403,4 @@ in rec { curl -L "https://github.com/Mic92/nix-index-database/releases/download/$tag/files" -o $XDG_RUNTIME_DIR/files-$tag mv $XDG_RUNTIME_DIR/files-$tag $HOME/.cache/nix-index/files ''; -} +} // nur diff --git a/shell.nix b/shell.nix index 83f5998..92a040b 100644 --- a/shell.nix +++ b/shell.nix @@ -27,7 +27,7 @@ let }; stockholm = { ref = "refs/heads/master"; - url = "https://cgit.krebsco.de/stockholm"; + url = "https://cgit.lassul.us/stockholm"; path = toString .versions/stockholm.json; }; retiolum = { @@ -35,11 +35,6 @@ let url = "https://github.com/krebs/retiolum"; path = toString .versions/retiolum.json; }; - nur = { - ref = "refs/heads/master"; - url = "https://github.com/nix-community/NUR"; - path = toString .versions/nur.json; - }; nixpkgs-mozilla = { ref = "refs/heads/master"; url = "https://github.com/mozilla/nixpkgs-mozilla"; diff --git a/submodules/nur-packages b/submodules/nur-packages new file mode 160000 index 0000000..263ae79 --- /dev/null +++ b/submodules/nur-packages @@ -0,0 +1 @@ +Subproject commit 263ae794413bec25d03b963a729ad535b87bfe3a