summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/agenix.nix16
-rw-r--r--flake.nix12
-rw-r--r--hosts/work.nix11
-rw-r--r--secrets/intelephense-licence.agebin0 -> 360 bytes
-rw-r--r--secrets/secrets.nixbin720 -> 772 bytes
5 files changed, 20 insertions, 19 deletions
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
--- /dev/null
+++ b/secrets/intelephense-licence.age
Binary files differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 5c3c4d9..57595a3 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
Binary files differ