diff --git a/flake.lock b/flake.lock index 8e3dcafa..38287d8b 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ ] }, "locked": { - "lastModified": 1661986298, - "narHash": "sha256-Um0W+tx/do1/rz8uORlkZuWwLYqRz2/qKsutLTtEdFg=", + "lastModified": 1662065525, + "narHash": "sha256-iZiuq7YH7UawZJ9Cr33nTzkSTWhxr7baAyL3w8sVX8I=", "owner": "accentor", "repo": "flake", - "rev": "05ff70af0e766702bfa9899ad8c490ed7726afb6", + "rev": "f0f53207f0a229bb8445242a0569ba5b65112903", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1661987768, - "narHash": "sha256-0bWcmrV+MfrXZCZr5rH3OfgSxMGXKTm1111Qt0RDEpA=", + "lastModified": 1662065113, + "narHash": "sha256-LYZ4Dd1d+K/ZOABQI/ujfoeHOwcz2VCwdU+lVHOuMGE=", "owner": "accentor", "repo": "api", - "rev": "5bff83066ca9d515c58b7d8ebb5de91fadfe071f", + "rev": "d3f865c3e2e75622a694854a56befe9a326dfada", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1661987849, - "narHash": "sha256-5yARIWmR5ID6Gf0mt1FT9fNSWUGpXvTPFIPfzTclqMU=", + "lastModified": 1662072497, + "narHash": "sha256-MHJTHaJDuzkiYwqBF8EPgOQHPGL1agF9Fqnut70DKAA=", "owner": "accentor", "repo": "web", - "rev": "fffec21fa2ac56ed84caf5a25d94219ed582fc1f", + "rev": "1ff601a7e5ad32007198b528562395ec3619faf3", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1652712410, - "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", + "lastModified": 1662046976, + "narHash": "sha256-BrTReGRhkVm/Kmmf4zQrL+oYWy0sds/BDBgXNX1CL3c=", "owner": "ryantm", "repo": "agenix", - "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", + "rev": "9f136ecfa5bf954538aed3245e4408cf87c85097", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1662028330, - "narHash": "sha256-pwYAjBPHg/uawK3BsEmwil3LhA8WQDvB8T3h/5QSTsM=", + "lastModified": 1662098936, + "narHash": "sha256-dAlpVqGis/LAx/mmNdwXkZ7YAzp25jRlb2wJ4eKkkAo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9a0afba2114ca5170fe959f0432bf7bd2b272114", + "rev": "68fbdf4f08f19f95b1c64b21c4db16403b5498e3", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1661931183, - "narHash": "sha256-0+2KzcexiJCB3Il5t7cZAM2RXNRfm5/gMCwhcZJxLuQ=", + "lastModified": 1662019588, + "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "97747d3209efde533f7b1b28f1be11619f556a06", + "rev": "2da64a81275b68fdad38af669afeda43d401e94b", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nur": { "locked": { - "lastModified": 1662036324, - "narHash": "sha256-DwXECqazTrHw8syTf7724ZrMufGx7OU2fftLN6kvyUM=", + "lastModified": 1662109208, + "narHash": "sha256-/+GnYpT4IdL2MEApFl8Ep/ZhXZJNf8asZ7f2XYWp1EI=", "owner": "nix-community", "repo": "NUR", - "rev": "3ca4abf86bd5759ca3f26b8011d41dc1b6b23c61", + "rev": "ff12ab38093fcf9060a4f1036c12e97182026cb8", "type": "github" }, "original": { @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1661985809, - "narHash": "sha256-pFpGF+6C1KCBlPYfrDei6C/C94guh7dcGOQu5QLM/RY=", + "lastModified": 1662068433, + "narHash": "sha256-dd8BMgo57SvlNmMF7OI0mGpHPBZKSHjifGQQXNdXSyk=", "owner": "chvp", "repo": "tetris", - "rev": "fedca68dd14d78f4afee4c5bf0a28db63f92e934", + "rev": "e8b47797210e7844210e7ee06ccd39193f090687", "type": "github" }, "original": { diff --git a/modules/base/zfs/default.nix b/modules/base/zfs/default.nix index 17344e0b..c2c50887 100644 --- a/modules/base/zfs/default.nix +++ b/modules/base/zfs/default.nix @@ -97,9 +97,8 @@ { ensureSystemPathsExist = { text = ensureSystemExistsScript; - deps = [ "agenixMountSecrets" ]; + deps = [ "agenixNewGeneration" ]; }; - agenixRoot.deps = [ "ensureSystemPathsExist" ]; ensureHomePathsExist = { text = '' mkdir -p /home/charlotte/ @@ -107,7 +106,7 @@ ''; deps = [ "users" "groups" ]; }; - agenix.deps = [ "ensureHomePathsExist" ]; + agenixInstall.deps = [ "ensureSystemPathsExist" "ensureHomePathsExist" ]; }; systemd.services =