diff --git a/flake.nix b/flake.nix index 77adb9608f4a51a0dcf5f61a789a02076da535df..b3dc1cbd66ba4ef57d02e1e921bf9894f95be3f6 100644 --- a/flake.nix +++ b/flake.nix @@ -83,12 +83,7 @@ inputs.agenix.nixosModules.default ./jasmine beszelAgent ]; - gunpowder.imports = [ - inputs.agenix.nixosModules.default - inputs.tailproxy.nixosModules.default - ./gunpowder - beszelAgent - ]; + gunpowder.imports = [ ./gunpowder ]; shincha = { pkgs, ... }: { diff --git a/gunpowder/beszel.nix b/gunpowder/beszel.nix deleted file mode 100644 index e7bc06397b0e5d4122a6a19e9280770a4c1ac2dc..0000000000000000000000000000000000000000 --- a/gunpowder/beszel.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, ... }: -{ - age.secrets.beszel-gunpowder.file = ../secrets/beszel-gunpowder.age; - services.beszel.agent = { - enable = true; - environment.LOG_LEVEL = "info"; - environmentFile = config.age.secrets.beszel-gunpowder.path; - }; -} diff --git a/gunpowder/default.nix b/gunpowder/default.nix index ae0bfcc6fdfda769b06a23ae1092b24ff122d39d..ae5a619b4d9d4a9786b351d064a826b9f14dcf35 100644 --- a/gunpowder/default.nix +++ b/gunpowder/default.nix @@ -4,10 +4,7 @@ username = "jolheiser"; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJh5aUDN/KN28+4tbayXRQliLyKFZaCZtUMEBNaJfHYj"; in { - imports = [ - ./beszel.nix - ./hardware.nix - ]; + imports = [ ./hardware.nix ]; boot = { kernelPackages = pkgs.linuxPackages_latest; @@ -134,3 +131,4 @@ environment.systemPackages = with pkgs; [ qbittorrent ]; system.stateVersion = "22.11"; } + diff --git a/secrets/beszel-gunpowder.age b/secrets/beszel-gunpowder.age deleted file mode 100644 index 342f510a49907881a399ae1ebea9c9c712595aff..0000000000000000000000000000000000000000 --- a/secrets/beszel-gunpowder.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g zstjpCd+Y2xfpYa4VO8r7D1Spin92xUhJkn67o+5RiM -aI9dh8Wv3a0wZDiOHAzlE0iqesPkF+qTLYcGJCBb6qs --> ssh-ed25519 xUMv2w qLBRbrSYvfsqYVvzsIbMxiJr38iC/A3MC5IO+Z0ONV4 -evuLqI56sHR18XUn5txE1Zy0gAJYD0IBu3wfmbXjpz8 ---- HjrNNXSuOKCzwaOxrO66zC/3VZUYy+4I4jleyyx9KRY -p2ۡ#:T1V!:L"5\`莓&H(%?W6W_g)7@a::|MPZ*Lt)Y =@ʵq)E *HJ{k \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 474e2a985c790f069c6ef8c870ac5518dc578662..b3e6d818bd78c001e8142d9891f3bddf229627ba 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -3,7 +3,6 @@ jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53"; shincha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBikiSP5UIoHgjZejxSt/ce2FxnYk9VGDW+h12QvefJ3"; jasmine = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4koC93ixwkFzMK+kYLk2A6+xn6xprzkk49k+avRZkn"; - gunpowder = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; dragonwellKeys = [ jolheiser @@ -17,10 +16,6 @@ jasmineKeys = [ jolheiser jasmine ]; - gunpowderKeys = [ - jolheiser - gunpowder - ]; in { @@ -35,5 +30,4 @@ "pocket-id.age".publicKeys = dragonwellKeys; "beszel-shincha.age".publicKeys = shinchaKeys; "beszel-dragonwell.age".publicKeys = dragonwellKeys; "beszel-jasmine.age".publicKeys = jasmineKeys; - "beszel-gunpowder.age".publicKeys = gunpowderKeys; }