diff --git a/flake.lock b/flake.lock index 029924c..7d0f532 100644 --- a/flake.lock +++ b/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": { diff --git a/hosts/desktopnix/fs.nix b/hosts/desktopnix/fs.nix index 6bcbb82..3127a61 100644 --- a/hosts/desktopnix/fs.nix +++ b/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";}; }; }; }; diff --git a/hosts/elisabeth/fs.nix b/hosts/elisabeth/fs.nix index d9e8a3d..c1f6d00 100644 --- a/hosts/elisabeth/fs.nix +++ b/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";}; }; }; }; diff --git a/hosts/gojo/fs.nix b/hosts/gojo/fs.nix index 834c865..25a24ed 100644 --- a/hosts/gojo/fs.nix +++ b/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"; diff --git a/hosts/maddy/fs.nix b/hosts/maddy/fs.nix index fc6838d..0caa2d7 100644 --- a/hosts/maddy/fs.nix +++ b/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"];}) }; }; diff --git a/hosts/patricknix/fs.nix b/hosts/patricknix/fs.nix index 1b0e476..1422909 100644 --- a/hosts/patricknix/fs.nix +++ b/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";}; }; }; }; diff --git a/modules/services/maddy.nix b/modules/services/maddy.nix index 37b8525..03f1358 100644 --- a/modules/services/maddy.nix +++ b/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"; diff --git a/users/common/graphical/default.nix b/users/common/graphical/default.nix index ab835f4..97c3d1b 100644 --- a/users/common/graphical/default.nix +++ b/users/common/graphical/default.nix @@ -13,6 +13,7 @@ zathura feh mpv + pinentry-gnome3 # for yubikey pinentry ]; };