diff --git a/.git-age.yaml b/.git-age.yaml index 9b0fe6bdd0fe13f422bf9b0f2972953795d1d4aa..997548f4caea9807dcbfa36287098cdc6dd2bdab 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -4,5 +4,3 @@ machines/common/cifs.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 machines/dragonwell/dex.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 -machines/dragonwell/vikunja.nix: - - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index 7fa6de1b9f3b5f9a6108d6fe6649e43d5588b5f6..bbc97fa42c1f6d7afaf88e58bfdb63e79ac49ab2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,3 @@ # Age 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 diff --git a/flake.lock b/flake.lock index 635e8f27475701628197e6a77ed9192425c940fd..bddb210bc932bc7642dc1e8487cd54c11087030e 100644 --- a/flake.lock +++ b/flake.lock @@ -281,13 +281,13 @@ } }, "nixpkgs": { "locked": { + "lastModified": 1696426674, { - ] - "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=", + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", "owner": "nixos", "repo": "nixpkgs", - "locked": { "nodes": { + "repo": "flake-utils", "type": "github" }, "original": { diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 51099aece410b9d49f480c7ce08205df6238ef0f..5169210a8785e39d2131179a12145e1e83957ab3 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -1,8 +1,5 @@ -{ - pkgs, - config, +}: { ... -}: { services.caddy = { enable = true; virtualHosts = { @@ -47,21 +44,25 @@ Redirecting to https://pkg.go.dev/go.jolheiser.com{uri} ` ''; }; - "git.jolheiser.com".extraConfig = '' + "git.jolheiser.com" = { - reverse_proxy localhost:8449 + extraConfig = '' - ''; - ... }: { + services.caddy = { - reverse_proxy localhost:4686 + ''; - ''; + }; - ... +}: { enable = true; - ... + extraConfig = '' +}: { virtualHosts = { - ''; + ''; - "todo.jolheiser.com".extraConfig = '' + }; }: { + "jolheiser.com" = { +{ - ''; + reverse_proxy localhost:2884 + ''; + }; }; }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 7c2af48a8e5bfe7a2f29d8f37e2880ba42c9cd44..dc6edda73bf53169d7415c76a360d0fbcf5eb0d5 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 ./ugit.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/dex.nix b/machines/dragonwell/dex.nix index b9c6209bc958c465b256731a0dd1d9a8de6b70e6..ba6524a7fa1418551becac90d64c2a913f9a093f 100644 Binary files a/machines/dragonwell/dex.nix and b/machines/dragonwell/dex.nix differ diff --git a/machines/dragonwell/vikunja.nix b/machines/dragonwell/vikunja.nix deleted file mode 100644 index 045a5210fb7f4d097343c5398dd483fa21c984b5..0000000000000000000000000000000000000000 Binary files a/machines/dragonwell/vikunja.nix and /dev/null differ diff --git a/secrets/personal/dex-vikunja.age b/secrets/personal/dex-vikunja.age deleted file mode 100644 index f75958233664861cecf08fcbd7dd78b7bc7f841b..0000000000000000000000000000000000000000 Binary files a/secrets/personal/dex-vikunja.age and /dev/null differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index de8302de02f7be589c7be107111c746761cd9564..01c1bd64a8e5669c5b3c59f806ddf24a8d8e2ac3 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -26,5 +26,4 @@ "personal/restic-pass.age".publicKeys = [jolheiser dragonwell]; "personal/restic-repo.age".publicKeys = [jolheiser dragonwell]; "personal/dex.age".publicKeys = [jolheiser dragonwell]; "personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell]; - "personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell]; }