.git-age.yaml

@@ -4,5 +4,3 @@ machines/common/cifs.nix:
     - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
 machines/dragonwell/dex.nix:
     - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
-machines/dragonwell/vikunja.nix:
-    - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7

.gitattributes

@@ -2,4 +2,3 @@
 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

flake.lock

@@ -281,11 +281,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1710827359,
+        "lastModified": 1706925685,
-        "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=",
+        "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5710127d9693421e78cca4f74fac2db6d67162b1",
+        "rev": "79a13f1437e149dc7be2d1290c74d378dad60814",
         "type": "github"
       },
       "original": {

machines/common/nogui/default.nix

@@ -43,7 +43,7 @@
 
   nix = {
     gc.automatic = true;
-    package = pkgs.nixVersions.stable;
+    package = pkgs.nixVersions.nix_2_15;
     settings = {
       trusted-users = ["@sudo" "@wheel" "jolheiser"];
       experimental-features = ["flakes" "nix-command" "repl-flake"];

machines/dragonwell/caddy.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  config,
-  ...
-}: {
   services.caddy = {
     enable = true;
     virtualHosts = {
@@ -47,18 +43,21 @@
             </body></html>`
         '';
       };
-      "git.jolheiser.com".extraConfig = ''
+      "git.jolheiser.com" = {
+        extraConfig = ''
           reverse_proxy localhost:8449
         '';
-      "social.jolheiser.com".extraConfig = ''
+      };
+      "social.jolheiser.com" = {
+        extraConfig = ''
           reverse_proxy localhost:4686
         '';
-      "auth.jolheiser.com".extraConfig = ''
+      };
+      "auth.jolheiser.com" = {
+        extraConfig = ''
           reverse_proxy localhost:2884
         '';
-      "todo.jolheiser.com".extraConfig = ''
+      };
-        reverse_proxy localhost:8636
-      '';
     };
   };
 }

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;

secrets/secrets.nix

@@ -26,5 +26,4 @@ in {
   "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];
 }