diff --git a/hosts/desktopnix/default.nix b/hosts/desktopnix/default.nix index d4f4ad7..b426cd1 100644 --- a/hosts/desktopnix/default.nix +++ b/hosts/desktopnix/default.nix @@ -10,7 +10,7 @@ ../../modules/graphical ../../modules/optional/xserver.nix - ../../modules/optional/secureboot.nix + #../../modules/optional/secureboot.nix ../../modules/hardware/intel.nix ../../modules/hardware/nintendo.nix diff --git a/hosts/desktopnix/fs.nix b/hosts/desktopnix/fs.nix index b395f79..053c694 100644 --- a/hosts/desktopnix/fs.nix +++ b/hosts/desktopnix/fs.nix @@ -12,9 +12,9 @@ type = "table"; format = "gpt"; partitions = [ - (partEfiBoot "boot" "0%" "1GiB") - (partSwap "swap" "1GiB" "17GiB") - (partLuksZfs "rpool" "rpool" "17GiB" "100%") + (partEfiBoot "boot" "0%" "2GiB") + (partSwap "swap" "2GiB" "18GiB") + (partLuksZfs "rpool" "rpool" "18GiB" "100%") ]; }; }; diff --git a/hosts/desktopnix/secrets/host.pub b/hosts/desktopnix/secrets/host.pub index 640d8e7..e7de588 100644 --- a/hosts/desktopnix/secrets/host.pub +++ b/hosts/desktopnix/secrets/host.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIyksR1mSMNMBurwJTONANGLg/+SUOrbJz0u7G9XUdS root@desktopnix +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK9sNwxT/iUNKf2oyb+pZl4lOhA2Yl67orJic/tWESXI diff --git a/hosts/testienix/fs.nix b/hosts/testienix/fs.nix index 32a63d9..360f19b 100644 --- a/hosts/testienix/fs.nix +++ b/hosts/testienix/fs.nix @@ -48,7 +48,7 @@ defaultZpoolOptions // { datasets = { - "save" = unmountable; + "safe" = unmountable; "safe/data" = filesystem "/data"; }; }; diff --git a/modules/config/system.nix b/modules/config/system.nix index 6b59ad0..0c7bef4 100644 --- a/modules/config/system.nix +++ b/modules/config/system.nix @@ -33,8 +33,10 @@ # to create a link called /run/agenix. Agenix should probably fail in this case, # but doesn't and instead puts the generation link into the existing directory. # TODO See https://github.com/ryantm/agenix/pull/187. - system.activationScripts.removeAgenixLink.text = "[[ ! -L /run/agenix ]] && [[ -d /run/agenix ]] && rm -rf /run/agenix"; - system.activationScripts.agenixNewGeneration.deps = ["removeAgenixLink"]; + system.activationScripts = { + removeAgenixLink.text = "[[ ! -L /run/agenix ]] && [[ -d /run/agenix ]] && rm -rf /run/agenix"; + #agenixNewGeneration.deps = ["removeAgenixLink"]; + }; time.timeZone = lib.mkDefault "Europe/Berlin"; i18n.defaultLocale = "C.UTF-8";