patrick/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Wiki Activity

chore: new disko

Browse source
This commit is contained in:
Patrick 2024-04-10 20:55:48 +02:00
parent 3d34caad78
commit 5bc5164148
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
8 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

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

8
hosts/desktopnix/fs.nix
View file

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

4
hosts/elisabeth/fs.nix
View file

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

2
hosts/gojo/fs.nix
View file

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

6
hosts/maddy/fs.nix
View file

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

6
hosts/patricknix/fs.nix
View file

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

4
modules/services/maddy.nix
View file

@ -83,10 +83,6 @@ in {
]; ];
tls = { tls = {
certificates = [ 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"; keyPath = "${config.security.acme.certs.mail_public.directory}/key.pem";
certPath = "${config.security.acme.certs.mail_public.directory}/fullchain.pem"; certPath = "${config.security.acme.certs.mail_public.directory}/fullchain.pem";

1
users/common/graphical/default.nix
View file

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