diff --git a/.git-age.yaml b/.git-age.yaml index 9b0fe6b..36c769f 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -4,5 +4,7 @@ machines/common/cifs.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 machines/dragonwell/dex.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 +machines/dragonwell/tandoor.nix: + - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 machines/dragonwell/vikunja.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index 7fa6de1..ff02440 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ apps/gui/firefox/work.nix filter=git-age diff=git-age machines/common/cifs.nix filter=git-age diff=git-age machines/dragonwell/dex.nix filter=git-age diff=git-age machines/dragonwell/vikunja.nix filter=git-age diff=git-age +machines/dragonwell/tandoor.nix filter=git-age diff=git-age diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 51099ae..1d66c9c 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - ... -}: { +{pkgs, ...}: { services.caddy = { enable = true; virtualHosts = { @@ -59,6 +55,9 @@ "todo.jolheiser.com".extraConfig = '' reverse_proxy localhost:8636 ''; + "recipes.jolheiser.com".extraConfig = '' + reverse_proxy localhost:3663 + ''; }; }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 7c2af48..9ba2714 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 ./vikunja.nix ./hardware.nix]; + imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./tandoor.nix ./ugit.nix ./vikunja.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/dex.nix b/machines/dragonwell/dex.nix index e81503c..aa5a673 100644 Binary files a/machines/dragonwell/dex.nix and b/machines/dragonwell/dex.nix differ diff --git a/machines/dragonwell/tandoor.nix b/machines/dragonwell/tandoor.nix new file mode 100644 index 0000000..efc4061 Binary files /dev/null and b/machines/dragonwell/tandoor.nix differ diff --git a/secrets/personal/dex-tandoor.age b/secrets/personal/dex-tandoor.age new file mode 100644 index 0000000..f93a15f --- /dev/null +++ b/secrets/personal/dex-tandoor.age @@ -0,0 +1,11 @@ +age-encryption.org/v1 +-> ssh-ed25519 E8j6/g KP8adYt7yepYjV1WCWB2k37H11nZS0syTPO6PVucDQ4 +nd9usbx1lF7W2NoRyBmdU+TkYw42yPc5+YLHPvFgf1U +-> ssh-ed25519 f31uNA 7VqN325Bduh25YchTA9x4fTSRd41a2YaVvDdLpwLpDQ +CqwaGdHTEgYBMAPu90iepQ49xYaWHG0FgstoW26nvx8 +-> =8c+@%-grease w_5b {U1m1b74 pok2 2(-Tc:-s +rOOI5rguWr1j4qgZ2pU46+aeXkrO4nj98K5haK31Cxa8dpWpX9griaZZY2yK9t90 +gREWgA+FELyBNadX +--- UsjsNVNstM008feyUFwjzDmO99vtJLO6V2/LjjErUX8 +om-`w*q+G :?{܄ +IV Ne~+ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index de8302d..1b7aeb0 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -27,4 +27,5 @@ in { "personal/dex.age".publicKeys = [jolheiser dragonwell]; "personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell]; "personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell]; + "personal/dex-tandoor.age".publicKeys = [jolheiser dragonwell]; }