chore: new disko

flake.lock

@@ -1183,11 +1183,11 @@
         "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
-        "lastModified": 1710447185,
-        "narHash": "sha256-M63b7f5dnGtLAZmgzSepQvcVA++QRJ+h8fSlyowgYcI=",
+        "lastModified": 1712774101,
+        "narHash": "sha256-t58qLvRLjrekfnHWS5Un5LXQJCrLeycKcuPRtoVqJbw=",
         "owner": "oddlama",
         "repo": "nixos-extra-modules",
-        "rev": "a4f79d7479bf63fb99e1d19cb6502feabc2854c3",
+        "rev": "0f4e5f7391532ddf105020a5be75421ea2e4fdc7",
         "type": "github"
       },
       "original": {

hosts/desktopnix/fs.nix

@@ -12,9 +12,9 @@
         content = with lib.disko.gpt; {
           type = "gpt";
           partitions = {
-            boot = (partEfi "0%" "2GiB") // {device = "${device}-part1";};
-            swap = (partSwap "2GiB" "18GiB") // {device = "${device}-part2";};
-            "rpool_m2-ssd" = (partLuksZfs "m2-ssd" "rpool" "18GiB" "100%") // {device = "${device}-part3";};
+            boot = (partEfi "2GiB") // {device = "${device}-part1";};
+            swap = (partSwap "16G") // {device = "${device}-part2";};
+            rpool = (partLuksZfs "m2-ssd" "rpool" "100%") // {device = "${device}-part3";};
           };
         };
       };
@@ -24,7 +24,7 @@
         content = with lib.disko.gpt; {
           type = "gpt";
           partitions = {
-            "panzer_sata-hdd" = (partLuksZfs "sata-hdd" "panzer" "0%" "100%") // {device = "${device}-part1";};
+            panzer = (partLuksZfs "sata-hdd" "panzer" "100%") // {device = "${device}-part1";};
           };
         };
       };

hosts/elisabeth/fs.nix

@@ -11,8 +11,8 @@
         content = with lib.disko.gpt; {
           type = "gpt";
           partitions = {
-            boot = (partEfi "0%" "1GiB") // {device = "${device}-part1";};
-            "rpool_ssd" = (partLuksZfs "ssd" "rpool" "1GiB" "100%") // {device = "${device}-part2";};
+            boot = (partEfi "1GiB") // {device = "${device}-part1";};
+            rpool = (partLuksZfs "ssd" "rpool" "100%") // {device = "${device}-part2";};
           };
         };
       };

hosts/gojo/fs.nix

@@ -11,7 +11,7 @@
         content = with lib.disko.gpt; {
           type = "gpt";
           partitions = {
-            boot = partEfi "0%" "260MB";
+            boot = partEfi "260MB";
             rpool = {
               content = {
                 type = "zfs";

hosts/maddy/fs.nix

@@ -11,9 +11,9 @@
         content = with lib.disko.gpt; {
           type = "gpt";
           partitions = {
-            grub = (partGrub "0%" "1MiB") // {device = "${device}-part1";};
-            bios = (partEfi "1MiB" "512MiB") // {device = "${device}-part2";};
-            "rpool_rpool" = (partLuksZfs "rpool" "rpool" "512MiB" "100%") // {device = "${device}-part3";};
+            grub = partGrub // {device = "${device}-part1";};
+            bios = (partEfi "512MiB") // {device = "${device}-part2";};
+            rpool = (partLuksZfs "rpool" "rpool" "100%") // {device = "${device}-part3";};
             #(lib.attrsets.recursiveUpdate (partLuksZfs "rpool" "rpool" "17GiB" "100%") {content.extraFormatArgs = ["--pbkdf pbkdf2"];})
           };
         };

hosts/patricknix/fs.nix

@@ -11,9 +11,9 @@
         content = with lib.disko.gpt; {
           type = "gpt";
           partitions = {
-            boot = (partEfi "0%" "1GiB") // {device = "${device}-part1";};
-            swap = (partSwap "1GiB" "17GiB") // {device = "${device}-part2";};
-            "rpool_rpool" = (partLuksZfs "rpool" "rpool" "17GiB" "100%") // {device = "${device}-part3";};
+            boot = (partEfi "1GiB") // {device = "${device}-part1";};
+            swap = (partSwap "16GiB") // {device = "${device}-part2";};
+            rpool = (partLuksZfs "rpool" "rpool" "100%") // {device = "${device}-part3";};
           };
         };
       };

modules/services/maddy.nix

@@ -83,10 +83,6 @@ in {
     ];
     tls = {
       certificates = [
-        {
-          keyPath = "${config.security.acme.certs.mail_private.directory}/key.pem";
-          certPath = "${config.security.acme.certs.mail_private.directory}/fullchain.pem";
-        }
         {
           keyPath = "${config.security.acme.certs.mail_public.directory}/key.pem";
           certPath = "${config.security.acme.certs.mail_public.directory}/fullchain.pem";

users/common/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./shells/alias.nix
     ./shells/zsh
-    ./shells/pager.nix
 
     ./programs/gpg.nix
     ./programs/htop.nix

users/common/graphical/default.nix

@@ -13,6 +13,7 @@
       zathura
       feh
       mpv
+      pinentry-gnome3 # for yubikey pinentry
     ];
   };
 

users/patrick/default.nix

@@ -72,6 +72,7 @@ lib.optionalAttrs (!minimal) {
         ../common/programs/poe.nix
         ../common/programs/spicetify.nix
         ../common/programs/thunderbird.nix
+        ../common/shells/pager.nix
       ]
       ++ {
         "desktopnix" = [