diff --git a/.git-age.yaml b/.git-age.yaml index 889843d..d706490 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -1,4 +1,6 @@ -"apps/gui/firefox/work.nix": - - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 -"machines/chai/cifs.nix": - - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 +apps/gui/firefox/work.nix: + - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 +machines/chai/cifs.nix: + - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 +machines/dragonwell/dex.nix: + - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index 3a43866..afc1751 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ # 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 758978a..f545469 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -53,6 +53,11 @@ reverse_proxy localhost:4686 ''; }; + "auth.jolheiser.com" = { + extraConfig = '' + reverse_proxy localhost:2884 + ''; + }; }; }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 14d13f6..dc6edda 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 ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./hardware.nix]; + imports = [./caddy.nix ./dex.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 new file mode 100644 index 0000000..cfc48c8 Binary files /dev/null and b/machines/dragonwell/dex.nix differ diff --git a/secrets/personal/dex.age b/secrets/personal/dex.age new file mode 100644 index 0000000..5182aec --- /dev/null +++ b/secrets/personal/dex.age @@ -0,0 +1,10 @@ +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 a38e355..cdffc0f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -21,4 +21,5 @@ in { "personal/restic-env.age".publicKeys = [jolheiser dragonwell]; "personal/restic-pass.age".publicKeys = [jolheiser dragonwell]; "personal/restic-repo.age".publicKeys = [jolheiser dragonwell]; + "personal/dex.age".publicKeys = [jolheiser dragonwell]; }