diff --git a/.git-age.yaml b/.git-age.yaml index d706490e027d9821d44691bfef9840f38fcc5200..889843dab438cb1eb2c1ab5652b965b304c23e32 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -1,6 +1,4 @@ -apps/gui/firefox/work.nix: - - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 -machines/chai/cifs.nix: +"apps/gui/firefox/work.nix": - - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 + - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 -machines/dragonwell/dex.nix: +"machines/chai/cifs.nix": - - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 + - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index afc1751bdb9012673c9509044ad8e268ce26e400..3a438665222ece4bfb526e149ae423fa4c24318a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,3 @@ # Age apps/gui/firefox/work.nix filter=git-age diff=git-age machines/chai/cifs.nix filter=git-age diff=git-age -machines/dragonwell/dex.nix filter=git-age diff=git-age diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index f54546993270ce882a1994158c137e6ea7c4909c..758978af12b3a38087e246c8464099e3a89ab39b 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -54,12 +54,6 @@ reverse_proxy localhost:4686 ''; }; virtualHosts = { - services.caddy = { - extraConfig = '' - reverse_proxy localhost:2884 - ''; - }; - virtualHosts = { virtualHosts = { }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index dc6edda73bf53169d7415c76a360d0fbcf5eb0d5..14d13f6e4b5d049514cd7421ee9c61d75999851a 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -2,7 +2,7 @@ let username = "jolheiser"; key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser''; in { - imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./hardware.nix]; + imports = [./caddy.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/dex.nix b/machines/dragonwell/dex.nix deleted file mode 100644 index cfc48c8e065e346e45134cb64c439237700b9f35..0000000000000000000000000000000000000000 Binary files a/machines/dragonwell/dex.nix and /dev/null differ diff --git a/secrets/personal/dex.age b/secrets/personal/dex.age deleted file mode 100644 index 5182aeccb71c5839ec3e190af39a889aedad6b6f..0000000000000000000000000000000000000000 --- a/secrets/personal/dex.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g 0WmXmz2U2bpITKZ2bgPCd3DfK4k4hpKd0u8VxbxeYy0 -FZwkWTfWej2T/gSlY0lfK1sSdVi8S4lrBoESovUpyH0 --> ssh-ed25519 f31uNA dkC6WYMKZi4Grwuk46cD7jQMJuZ1RVZiyCdTHp16IHo -KoAfb+KXqpEOc6D09H5RwzGjtPxjXdFI1UTFatk5zQA --> kS^C9b-grease F,:|ls xZy d -B1g4o5732yfNDXuAXMp0Cb4L2wXRrX4NhLmMejaEMVN9vzP48AUTexP/FwfCCOr6 -9pS+SHYRTrCDEdlnpL13sTdmSrn1 ---- ccB91SvSL/KxJW6VlQr5nKiVqnKP54KOZswReVv1/HY -Nw|]HQ>KLJȨ߳ߟ՗fO3zE|0[D3JʁT%xQ,:^Uwf?NYV8``jx$1|6$+#Pc \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index cdffc0f2e69cde353e3aec5ca7168b8ec842fb8d..a38e355a12892158e7b2730e1a9fce693358aab7 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -22,6 +22,4 @@ "personal/restic-env.age".publicKeys = [jolheiser dragonwell]; "personal/restic-pass.age".publicKeys = [jolheiser dragonwell]; "personal/restic-repo.age".publicKeys = [jolheiser dragonwell]; jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; - sencha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJurjAMu4IXgpBwgUP0QvE2ySE5/Orn/yflkdWVvy6Am"; - jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM";