flake.lock: Update

Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/96e078c646b711aee04b82ba01aefbff87004ded?narHash=sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus%3D' (2025-04-26)
  → 'github:ryantm/agenix/4835b1dc898959d8547a871ef484930675cb47f1?narHash=sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY%2BD81k%3D' (2025-05-18)
• Updated input 'home-manager':
    'github:nix-community/home-manager/50eee705bbdbac942074a8c120e8194185633675?narHash=sha256-EyXUNSa%2BH%2BYvGVuQJP1nZskXAowxKYp79RNUsNdQTj4%3D' (2025-05-02)
  → 'github:nix-community/home-manager/d5f1f641b289553927b3801580598d200a501863?narHash=sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz%2BAFQF7n9NmNc%3D' (2025-05-19)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/1d3aeb5a193b9ff13f63f4d9cc169fb88129f860?narHash=sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0%3D' (2025-05-06)
  → 'github:NixOS/nixpkgs/2baa12ff69913392faf0ace833bc54bba297ea95?narHash=sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0%3D' (2025-05-21)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/0bb671aaa84205c180ec9122d9aa2f5823b7b2aa?narHash=sha256-JtzH3pV0oqlR9lTccOU5SbAY8PzbEp2lyXKlD/DGdRQ%3D' (2025-05-10)
  → 'github:NixOS/nixpkgs/81e63461fb905af981fcb99057a845a930999eaa?narHash=sha256-p4cM3XaeN7YLMw4dSRCIZwXPxOS1SelqxPBUNs0IF6A%3D' (2025-05-25)
• Updated input 'nur':
    'github:nix-community/NUR/887e5be213778cb047379434b6bb41ad09d9c8db?narHash=sha256-%2BU1n00EyLKzvZlMHK/YGS6OGIYsKfaz4j1qydyyrIRk%3D' (2025-05-10)
  → 'github:nix-community/NUR/d8bccb87461726979bc4fe9facbdfa0739fe24a2?narHash=sha256-AWYa6QSgYbd0YiOecaTyJ78XSHcLI7yljdSpBTQWB%2B8%3D' (2025-05-24)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/dda3dcd3fe03e991015e9a74b22d35950f264a54?narHash=sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ%2BTCkTRpRc%3D' (2025-05-08)
  → 'github:nixos/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c?narHash=sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o%3D' (2025-05-23)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/be092436d4c0c303b654e4007453b69c0e33009e?narHash=sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko%3D' (2025-05-10)
  → 'github:oxalica/rust-overlay/2221d8d53c128beb69346fa3ab36da3f19bb1691?narHash=sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4%3D' (2025-05-24)
• Updated input 'stockholm':
    'github:krebs/stockholm/8d0538bf86e4f9df4f5cc358a1760b255be797e9?narHash=sha256-tQZ8sXCU6yvC0ut/%2BezRUSd89Nbyqqn0JVCjYDwcqQA%3D' (2025-02-11)
  → 'github:krebs/stockholm/d4abc837cc7b87b4f23fe48cc306df26e3de7aab?narHash=sha256-i2s6jU%2B8GLKVjhWDyvFYxmXI7A44c9p6apPPyKt0ETk%3D' (2025-05-13)
• Updated input 'stockholm/buildbot-nix':
    'github:Mic92/buildbot-nix/c077f430f3717d41bb303d031398058665315166?narHash=sha256-T9THCbnlj4CkKbTP%2BlisA5PUMoTXE7uh4FyDQzui%2Bdc%3D' (2025-01-26)
  → 'github:Mic92/buildbot-nix/7ad9b4886eccb5eecc0686a16266ddabf6cbefe9?narHash=sha256-mRnIdJLP%2B0NSim9ao30ue0Z3ttSuxzXwQG7UN1KuKfU%3D' (2025-05-07)
• Updated input 'stockholm/buildbot-nix/flake-parts':
    'github:hercules-ci/flake-parts/b905f6fc23a9051a6e1b741e1438dbfc0634c6de?narHash=sha256-%2Bhu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU%3D' (2025-01-06)
  → 'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5?narHash=sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY%3D' (2025-04-01)
• Updated input 'stockholm/buildbot-nix/hercules-ci-effects':
    'github:hercules-ci/hercules-ci-effects/afd0a42e8c61ebb56899315ee4084a8b2e4ff425?narHash=sha256-JTBWmyGf8K1Rwb%2BgviHIUzRJk/sITtT%2B72HXFkTZUjo%3D' (2025-01-15)
  → 'github:hercules-ci/hercules-ci-effects/5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e?narHash=sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY%3D' (2025-04-15)
• Updated input 'stockholm/buildbot-nix/treefmt-nix':
    'github:numtide/treefmt-nix/f2cc121df15418d028a59c9737d38e3a90fbaf8f?narHash=sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo%3D' (2025-01-21)
  → 'github:numtide/treefmt-nix/29ec5026372e0dec56f890e50dbe4f45930320fd?narHash=sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4%3D' (2025-05-02)
• Updated input 'stockholm/nixpkgs':
    'github:NixOS/nixpkgs/852ff1d9e153d8875a83602e03fdef8a63f0ecf8?narHash=sha256-Zf0hSrtzaM1DEz8//%2BXs51k/wdSajticVrATqDrfQjg%3D' (2025-01-26)
  → 'github:NixOS/nixpkgs/d89fc19e405cb2d55ce7cc114356846a0ee5e956?narHash=sha256-3e%2BAVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ%3D' (2025-05-10)
• Updated input 'stylix':
    'github:danth/stylix/20ace60f9cb5e179cb2256abaee505780df8e804?narHash=sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9%2BXt7ZHtfhI%3D' (2025-05-01)
  → 'github:danth/stylix/66f554e4e32d804bcf2c007a7b7efef04a3773b0?narHash=sha256-DYdmj22ZvkN5x9/VtdV5Wnze%2BUaPuboYraCPnOWn6u4%3D' (2025-05-20)

configs/default.nix

@@ -6,16 +6,18 @@
   unstablePackages,
   inputs,
   ...
-}: let
+}:
+let
   inherit (lib.strings) makeBinPath;
   inherit (import ../lib) localAddresses kieran remoteDir;
-  defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
+  defaultApplications = (import ../lib).defaultApplications { inherit pkgs; };
-in {
+in
+{
   imports = [
     inputs.self.nixosModules.system-dependent
     inputs.self.nixosModules.power-action
     {
-      boot.supportedFilesystems = ["ntfs"];
+      boot.supportedFilesystems = [ "ntfs" ];
     }
     {
       nixpkgs = {
@@ -74,7 +76,10 @@ in {
         hashedPasswordFile = config.age.secrets.kfm-password.path;
         isNormalUser = true;
         uid = 1000;
-        extraGroups = ["pipewire" "audio"];
+        extraGroups = [
+          "pipewire"
+          "audio"
+        ];
       };
 
       nix.settings.trusted-users = [ config.users.users.me.name ];
@@ -87,25 +92,27 @@ in {
     }
     {
       environment.interactiveShellInit = "export PATH=$PATH";
-      environment.shellAliases = let
+      environment.shellAliases =
-        swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
+        let
-      in {
+          swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
-        o = "${pkgs.xdg-utils}/bin/xdg-open";
+        in
-        ns = "nix-shell --run zsh";
+        {
-        pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
+          o = "${pkgs.xdg-utils}/bin/xdg-open";
-        pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
+          ns = "nix-shell --run zsh";
-        tmux = "${pkgs.tmux}/bin/tmux -2";
+          pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
-        sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
+          pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
-        zathura = swallow "${pkgs.zathura}/bin/zathura";
+          tmux = "${pkgs.tmux}/bin/tmux -2";
-        im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
+          sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
-        yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
+          zathura = swallow "${pkgs.zathura}/bin/zathura";
-        yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format opus --audio-quality 0 -xic"; # Download with audio
+          im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
-      };
+          yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
+          yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format opus --audio-quality 0 -xic"; # Download with audio
+        };
     }
     {
       i18n = {
         defaultLocale = "en_DK.UTF-8";
-        supportedLocales = ["all"];
+        supportedLocales = [ "all" ];
       };
     }
     {
@@ -121,12 +128,18 @@ in {
           enable = true;
           greeters.gtk = {
             enable = true;
-            indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
+            indicators = [
+              "~spacer"
+              "~host"
+              "~spacer"
+              "~session"
+              "~power"
+            ];
           };
         };
       };
     }
-    {programs.command-not-found.enable = true;}
+    { programs.command-not-found.enable = true; }
     {
       programs.gnupg = {
         agent = {
@@ -141,7 +154,11 @@ in {
 
       environment.systemPackages = [
         pkgs.gnupg
-        (pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
+        (pkgs.pass.withExtensions (e: [
+          e.pass-otp
+          e.pass-import
+          e.pass-genphrase
+        ]))
       ];
     }
     {
@@ -154,12 +171,10 @@ in {
       };
     }
     {
-      networking.hosts =
+      networking.hosts = lib.mapAttrs' (name: address: {
-        lib.mapAttrs' (name: address: {
+        name = address;
-          name = address;
+        value = [ "${name}.local" ];
-          value = ["${name}.local"];
+      }) localAddresses;
-        })
-        localAddresses;
     }
     {
       home-manager.users.me.home.stateVersion = "22.05";
@@ -167,9 +182,9 @@ in {
     }
     {
       systemd.user.services.udiskie = {
-        after = ["udisks2.service"];
+        after = [ "udisks2.service" ];
-        wants = ["udisks2.service"];
+        wants = [ "udisks2.service" ];
-        wantedBy = ["graphical-session.target"];
+        wantedBy = [ "graphical-session.target" ];
         serviceConfig = {
           ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
         };
@@ -212,7 +227,8 @@ in {
     ./keyboard.nix
     ./mycelium.nix
     ./kdeconnect.nix
-    {home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose;}
+    { home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose; }
+    { services.upower.enable = true; }
     ./lb.nix
     ./mpv.nix
     ./mime.nix
@@ -276,7 +292,7 @@ in {
           download = "${config.users.users.me.home}/sync/Downloads";
           music = "${config.users.users.me.home}/mobile/audio";
           pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder";
-          publicShare =  "${config.users.users.me.home}/cloud/nextcloud/tmp";
+          publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
           videos = pictures;
         };
       };

configs/fu-berlin.nix

@@ -131,7 +131,10 @@ in {
     (pkgs.writers.writeDashBin "fu-vpn" ''
       if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
       then
-        ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --useragent=AnyConnect
+        # root firefox will not open login window unless root owns Xauthority
+        sudo cp $XAUTHORITY /root/.Xauthority
+        sudo chown root: /root/.Xauthority
+        XAUTHORITY=/root/.Xauthority sudo ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --useragent=AnyConnect
       fi
     '')
   ];

configs/i3.nix

@@ -6,10 +6,8 @@
   ...
 }: let
   dashboard = pkgs.writers.writeDashBin "dashboard" ''
-    ${pkgs.alacritty}/bin/alacritty --class wtf --command ${pkgs.writers.writeDash "dashboard-inner" ''
+    ${pkgs.alacritty}/bin/alacritty --option font.size=4 --class dashboard --command ${pkgs.writers.writeDash "dashboard-inner" ''
-      export WTF_OWM_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
+      exec ${pkgs.procps}/bin/watch -c -n 10 ${niveumPackages.q}/bin/q
-      export WTF_MINIFLUX_API_KEY="$(cat ${config.age.secrets.miniflux-api-token.path})"
-      exec ${niveumPackages.dashboard}/bin/dashboard
     ''}
   '';
   inherit (import ../lib) defaultApplications;
@@ -310,7 +308,7 @@ in {
         exec "${pkgs.writers.writeDash "irc" "exec ${pkgs.alacritty}/bin/alacritty --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
         exec "${pkgs.writers.writeDash "email" "exec ${pkgs.alacritty}/bin/alacritty --class message -e aerc"}"
 
-        assign [class="wtf"] ${infoWorkspace}
+        assign [class="dashboard"] ${infoWorkspace}
         exec ${dashboard}/bin/dashboard
       '';
       config = lib.mkMerge [

configs/i3status-rust.nix

@@ -55,7 +55,9 @@
           }
           {
             block = "battery";
-            device = config.niveum.batteryName;
+            format = "$icon $percentage $time";
+            device = "DisplayDevice";
+            driver = "upower";
           }
           {
             block = "sound";

configs/ssh.nix

@@ -75,8 +75,8 @@ in {
         user = "kfm";
         port = sshPort;
       };
-      kibbeh = {
+      kabsa = {
-        hostname = "kibbeh.r";
+        hostname = "kabsa.r";
         user = "kfm";
         port = sshPort;
       };

flake.lock

@@ -12,11 +12,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1747514353,
+        "lastModified": 1747575206,
-        "narHash": "sha256-E1WjB+zvDw4x058mg3MIdK5j2huvnNpTEEt2brhg2H8=",
+        "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "6697e8babbd8f323dfd5e28f160a0128582c128b",
+        "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
         "type": "github"
       },
       "original": {
@@ -654,11 +654,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747331121,
+        "lastModified": 1747688870,
-        "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=",
+        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608",
+        "rev": "d5f1f641b289553927b3801580598d200a501863",
         "type": "github"
       },
       "original": {
@@ -1109,11 +1109,11 @@
     },
     "nixpkgs-unstable_2": {
       "locked": {
-        "lastModified": 1747529194,
+        "lastModified": 1748134661,
-        "narHash": "sha256-Vq5qJpg87+CMgc7r5ystLFKeMW1MYRall+x07slUUtM=",
+        "narHash": "sha256-p4cM3XaeN7YLMw4dSRCIZwXPxOS1SelqxPBUNs0IF6A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9c41bec752558e97427e6895c2ea02d80c5930b2",
+        "rev": "81e63461fb905af981fcb99057a845a930999eaa",
         "type": "github"
       },
       "original": {
@@ -1231,11 +1231,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1747335874,
+        "lastModified": 1747862697,
-        "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
+        "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
+        "rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
         "type": "github"
       },
       "original": {
@@ -1247,11 +1247,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1747327360,
+        "lastModified": 1748026106,
-        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
+        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
+        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
         "type": "github"
       },
       "original": {
@@ -1395,11 +1395,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1747525536,
+        "lastModified": 1748124399,
-        "narHash": "sha256-hUO0fgjfNeL2kX/ahXrErTwYxDY+NBWd//PqHTJmCps=",
+        "narHash": "sha256-AWYa6QSgYbd0YiOecaTyJ78XSHcLI7yljdSpBTQWB+8=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "beb1ef00d70f1baae3683c46bfe3296785a93c6f",
+        "rev": "d8bccb87461726979bc4fe9facbdfa0739fe24a2",
         "type": "github"
       },
       "original": {
@@ -1568,11 +1568,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747449297,
+        "lastModified": 1748054080,
-        "narHash": "sha256-veyXchTz6eWwvuW5X49UluHkheHkFcqHJSwGuKBhrmQ=",
+        "narHash": "sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f44db7d7cea4528288780c6347756173a8248225",
+        "rev": "2221d8d53c128beb69346fa3ab36da3f19bb1691",
         "type": "github"
       },
       "original": {
@@ -1712,11 +1712,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1746143246,
+        "lastModified": 1747771231,
-        "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=",
+        "narHash": "sha256-DYdmj22ZvkN5x9/VtdV5Wnze+UaPuboYraCPnOWn6u4=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "20ace60f9cb5e179cb2256abaee505780df8e804",
+        "rev": "66f554e4e32d804bcf2c007a7b7efef04a3773b0",
         "type": "github"
       },
       "original": {

flake.nix

@@ -395,6 +395,7 @@
         opustags = pkgs.callPackage packages/opustags.nix {};
         pls = pkgs.callPackage packages/pls.nix {};
         polyglot = pkgs.callPackage packages/polyglot.nix {};
+        q = pkgs.callPackage packages/q.nix {};
         qrpaste = pkgs.callPackage packages/qrpaste.nix {};
         random-zeno = pkgs.callPackage packages/random-zeno.nix {};
         rfc = pkgs.callPackage packages/rfc.nix {};

lib/mycelium-network.nix

@@ -2,7 +2,7 @@
   zaatar = "5c5:49e0:7793:f017:59e1:1715:9e0e:3fc8";
   fatteh = "463:a0d4:daa3:aa8d:a9b1:744a:46a5:7a80";
   ful = "5bf:d60e:bebf:5163:f495:8787:880c:6d41";
-  kibbeh = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
+  kabsa = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
   makanek = "43f:ad4f:fa67:d9f7:8a56:713c:7418:164b";
   manakish = "512:d3bd:3cd9:fcc8:ae34:81fa:385f:8c21";
 }

packages/q.nix

@@ -0,0 +1,9 @@
+{ writers, lib, todoman, khal, util-linux, wego, pass }:
+writers.writeDashBin "q" ''
+  export PATH=$PATH:${lib.makeBinPath [todoman khal util-linux wego pass]}
+  (todo list --due 240; echo) &
+  (khal list today today; echo) &
+  (cal -3; echo) &
+  (wego -location Berlin -owm-api-key "$(pass api-keys/openweathermap)" -frontend emoji -days 2; echo) &
+  wait
+''

systems/kabsa/configuration.nix

@@ -7,7 +7,7 @@
   inherit (import ../../lib) retiolumAddresses;
 in {
   imports = [
-    ./hardware-configuration.nix
+    ../kibbeh/hardware-configuration.nix
     ../../configs/tlp.nix
     ../../configs/default.nix
     ../../configs/networkmanager.nix
@@ -55,5 +55,5 @@ in {
     retiolum = retiolumAddresses.kabsa;
   };
 
-  system.stateVersion = "19.03";
+  system.stateVersion = "23.11";
 }

systems/kibbeh/configuration.nix

@@ -42,14 +42,8 @@
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.lightdm.enableGnomeKeyring = true;
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   services.openssh.enable = true;
 
-  boot.initrd.luks.devices."luks-b3988d35-72a9-4e7c-992d-f500bb388554".device =
-    "/dev/disk/by-uuid/b3988d35-72a9-4e7c-992d-f500bb388554";
-
   networking.hostName = "kibbeh";
   networking.networkmanager.enable = true;
 

systems/kibbeh/hardware-configuration.nix

@@ -1,42 +1,54 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
-# and may be overwritten by future invocations.  Please make changes
+  config,
-# to /etc/nixos/configuration.nix instead.
+  lib,
-{ config, lib, pkgs, modulesPath, ... }:
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot = {
-  boot.initrd.kernelModules = [ ];
+    initrd = {
-  boot.kernelModules = [ "kvm-intel" ];
+      availableKernelModules = [
-  boot.extraModulePackages = [ ];
+        "ehci_pci"
+        "ahci"
+        "usb_storage"
+        "sd_mod"
+        "sdhci_pci"
+      ];
+      luks.devices."luks-16a8b3b0-5e0a-4d36-920c-eb6322a3c181".device =
+        "/dev/disk/by-uuid/16a8b3b0-5e0a-4d36-920c-eb6322a3c181";
+      luks.devices."luks-b3988d35-72a9-4e7c-992d-f500bb388554".device =
+        "/dev/disk/by-uuid/b3988d35-72a9-4e7c-992d-f500bb388554";
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
 
-  fileSystems."/" =
+  fileSystems = {
-    { device = "/dev/disk/by-uuid/ecab6acb-66f1-41c9-8281-59c76cf8f0c6";
+    "/" = {
+      device = "/dev/disk/by-uuid/ecab6acb-66f1-41c9-8281-59c76cf8f0c6";
       fsType = "ext4";
     };
-
+    "/boot" = {
-  boot.initrd.luks.devices."luks-16a8b3b0-5e0a-4d36-920c-eb6322a3c181".device = "/dev/disk/by-uuid/16a8b3b0-5e0a-4d36-920c-eb6322a3c181";
+      device = "/dev/disk/by-uuid/8066-63C2";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/8066-63C2";
       fsType = "vfat";
     };
+  };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/8cebdb17-4f2e-4750-8e91-71aa942bdfde"; }
+    { device = "/dev/disk/by-uuid/8cebdb17-4f2e-4750-8e91-71aa942bdfde"; }
-    ];
+  ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wwp0s29u1u4i6.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;