feat: simplify flake-parts imports

This commit is contained in:
Leon Schwarzäugl 2026-03-31 17:44:24 +02:00
parent 3d3e8d450d
commit ff8dd91aef
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
24 changed files with 77 additions and 79 deletions

View file

@ -17,6 +17,8 @@
Service = {
ExecStart = "${lib.getExe pkgs.attic-client} watch-store ${config.swarselsystems.mainUser}:${config.swarselsystems.mainUser}";
Restart = "on-failure";
RestartSec = 30;
};
};
};

View file

@ -24,7 +24,7 @@ in
in
''
plugin-files = ${nix-plugins}/lib/nix/plugins
extra-builtins-file = ${self + /nix/extra-builtins.nix}
extra-builtins-file = ${self + /files/nix/extra-builtins.nix}
'';
settings = {
experimental-features = [

View file

@ -10,7 +10,7 @@ let
# Throw an error if that doesn't exist.
sopsImportEncrypted =
assert lib.assertMsg (builtins ? extraBuiltins.sopsImportEncrypted)
"The extra builtin 'sopsImportEncrypted' is not available, so repo.secrets cannot be decrypted. Did you forget to add nix-plugins and point it to `<flakeRoot>/nix/extra-builtins.nix` ?";
"The extra builtin 'sopsImportEncrypted' is not available, so repo.secrets cannot be decrypted. Did you forget to add nix-plugins and point it to `<flakeRoot>/files/nix/extra-builtins.nix` ?";
builtins.extraBuiltins.sopsImportEncrypted;
# This "imports" an encrypted .nix.age file by evaluating the decrypted content.

View file

@ -111,7 +111,7 @@ in
in
''
plugin-files = ${nix-plugins}/lib/nix/plugins
extra-builtins-file = ${self + /nix/extra-builtins.nix}
extra-builtins-file = ${self + /files/nix/extra-builtins.nix}
'' + lib.optionalString (!minimal) ''
!include ${config.sops.secrets.github-api-token.path}
'';