diff --git a/flake.nix b/flake.nix index 2fd1d052..5dfda9b8 100644 --- a/flake.nix +++ b/flake.nix @@ -110,6 +110,7 @@ # Only use imports as minimally as possible with the absolute # requirements of a host. imports = [ + inputs.agenix.nixosModules.age inputs.home-manager.nixosModules.home-manager ]; @@ -187,6 +188,14 @@ home-manager.sharedModules = lib'.modulesToList (lib'.filesToAttr ./modules/home-manager); home-manager.extraSpecialArgs = { inherit inputs system self; }; + + # Enabling some things for agenix. + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + services.sshd.enable = true; + services.openssh.enable = true; }; mkUser = { system ? defaultSystem, extraModules ? [ ] }: diff --git a/hosts/ni/default.nix b/hosts/ni/default.nix index b8c1abff..81f13b54 100644 --- a/hosts/ni/default.nix +++ b/hosts/ni/default.nix @@ -24,7 +24,6 @@ # My custom configuration with my custom modules starts here. profiles = { - agenix.enable = true; archiving.enable = true; system = { enable = true; diff --git a/modules/nixos/profiles/agenix.nix b/modules/nixos/profiles/agenix.nix deleted file mode 100644 index b5a5bcd1..00000000 --- a/modules/nixos/profiles/agenix.nix +++ /dev/null @@ -1,19 +0,0 @@ -# A module that automates setting up agenix for your system. -{ inputs, lib, options, config, system, ... }: - -let cfg = config.profiles.agenix; -in { - options.profiles.agenix.enable = - lib.mkEnableOption "agenix-related config on your system"; - - imports = [ inputs.agenix.nixosModules.age ]; - config = lib.mkIf cfg.enable { - # Enable all relevant services. - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - services.sshd.enable = true; - services.openssh.enable = true; - }; -} diff --git a/modules/nixos/tasks/backup-archive/default.nix b/modules/nixos/tasks/backup-archive/default.nix index 66746f05..00a9b2f0 100644 --- a/modules/nixos/tasks/backup-archive/default.nix +++ b/modules/nixos/tasks/backup-archive/default.nix @@ -41,14 +41,6 @@ in { lib.mkEnableOption "backup setup with BorgBackup"; config = lib.mkIf cfg.enable { - assertions = [{ - assertion = config.profiles.agenix.enable; - message = '' - Agenix module is not enabled. This is needed for the borg configuration - we're using. - ''; - }]; - age.secrets.borg-password.file = lib.getSecret "archive/password"; age.secrets.borg-patterns.file = lib.getSecret "archive/borg-patterns"; age.secrets.borg-patterns-local.file =