From fddf6b536276c5f617cdc6089c7bdc960e24792b Mon Sep 17 00:00:00 2001 From: Jasper Ras Date: Sun, 17 Nov 2024 11:14:22 +0100 Subject: some changes agenix --- config/agenix.nix | 16 ---------------- flake.nix | 12 +++++++++--- hosts/work.nix | 11 +++++++++++ secrets/intelephense-licence.age | Bin 0 -> 360 bytes secrets/secrets.nix | Bin 720 -> 772 bytes 5 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 config/agenix.nix create mode 100644 secrets/intelephense-licence.age diff --git a/config/agenix.nix b/config/agenix.nix deleted file mode 100644 index aa8bd1d..0000000 --- a/config/agenix.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ inputs, ... }: -{ - environment.systemPackages = [ - inputs.agenix.packages."x86_64-linux".default - ]; - age.secrets.ghostnet-cert.file = ../secrets/ghostnet-cert.age; - age.secrets.ghostnet-key.file = ../secrets/ghostnet-key.age; - age.secrets.ghostnet-ca.file = ../secrets/ghostnet-ca.age; - age.secrets.ghostnet-tls-auth.file = ../secrets/ghostnet-tls-auth.age; - age.secrets.ghostnet-auth-user-pass.file = ../secrets/ghostnet-auth-user-pass.age; - - age.secrets.systems-cert.file = ../secrets/systems-cert.age; - age.secrets.systems-key.file = ../secrets/systems-key.age; - age.secrets.systems-ca.file = ../secrets/systems-ca.age; - age.secrets.systems-tls-auth.file = ../secrets/systems-tls-auth.age; -} diff --git a/flake.nix b/flake.nix index 2d0988b..ae13cfc 100644 --- a/flake.nix +++ b/flake.nix @@ -22,15 +22,21 @@ hostDefaults.modules = [ home-manager.nixosModules.home-manager agenix.nixosModules.default - ./config/shared.nix ]; hosts.work.modules = [ update-systemd-resolved.nixosModules.update-systemd-resolved - ./config/agenix.nix ./hosts/work.nix + { + environment.systemPackages = [ agenix.packages.${utils.lib.system.x86_64-linux}.default ]; + } + ]; + hosts.tarrel.modules = [ + ./hosts/tarrel.nix + { + environment.systemPackages = [ agenix.packages.${utils.lib.system.x86_64-linux}.default ]; + } ]; - hosts.tarrel.modules = [./hosts/tarrel.nix]; }; } diff --git a/hosts/work.nix b/hosts/work.nix index d36bfc3..f24863d 100644 --- a/hosts/work.nix +++ b/hosts/work.nix @@ -2,6 +2,17 @@ { imports = [ ./hardware-configuration/work.nix ]; + age.secrets.ghostnet-cert.file = ../secrets/ghostnet-cert.age; + age.secrets.ghostnet-key.file = ../secrets/ghostnet-key.age; + age.secrets.ghostnet-ca.file = ../secrets/ghostnet-ca.age; + age.secrets.ghostnet-tls-auth.file = ../secrets/ghostnet-tls-auth.age; + age.secrets.ghostnet-auth-user-pass.file = ../secrets/ghostnet-auth-user-pass.age; + + age.secrets.systems-cert.file = ../secrets/systems-cert.age; + age.secrets.systems-key.file = ../secrets/systems-key.age; + age.secrets.systems-ca.file = ../secrets/systems-ca.age; + age.secrets.systems-tls-auth.file = ../secrets/systems-tls-auth.age; + environment.systemPackages = with pkgs; [ slack git-review diff --git a/secrets/intelephense-licence.age b/secrets/intelephense-licence.age new file mode 100644 index 0000000..9e7bf25 Binary files /dev/null and b/secrets/intelephense-licence.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5c3c4d9..57595a3 100644 Binary files a/secrets/secrets.nix and b/secrets/secrets.nix differ -- cgit v1.2.3