refactor: hjemify foot & keepassxc

flake.lock

@@ -325,11 +325,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1739197721,
+        "lastModified": 1738782767,
-        "narHash": "sha256-+EYoZfeHycIH52SJMEkGtmsTddXa8dW06aDJCVg+lcI=",
+        "narHash": "sha256-768XlaosBb5MX4QhfaOkWbNISoFDA+YUj/C96c6KlQ8=",
         "ref": "refs/heads/main",
-        "rev": "603e1c09b39ee57f6ea94f45b117360736816358",
+        "rev": "51f3bdd7cb2330c4863ad81896ca20ce09e5cf01",
-        "revCount": 106,
+        "revCount": 105,
         "type": "git",
         "url": "https://git.ccnlc.eu/nydragon/nysh.git"
       },

hosts/raptus/default.nix

@@ -13,7 +13,8 @@ in
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
     ./disk-config.nix
-    ./forgejo
+    ./forgejo.nix
+    ./forgejo-runner.nix
     ./headscale
     ./fail2ban.nix
   ];

hosts/raptus/forgejo.nix

@@ -4,10 +4,6 @@ let
   sshPort = 2222;
 in
 {
-  imports = [
-    ./runner.nix
-  ];
-
   systemd.tmpfiles.rules =
     let
       # Disallow crawlers from indexing this site.

hosts/raptus/headscale/acls.nix

@@ -2,7 +2,6 @@
   pkgs,
   options,
   lib,
-  self,
   ...
 }:
 let
@@ -14,9 +13,6 @@ let
     action = "accept";
     inherit src dst users;
   };
-
-  shanMeta = self.nixosConfigurations.shan.config.modules.meta;
-  homeAIp = "100.64.0.9";
 in
 {
   services.headscale.settings.policy.path = pkgs.writeTextFile {
@@ -43,7 +39,7 @@ in
           [
             "tag:guest"
           ]
-          [ "${shanMeta.tailscale.ip}:443" "${homeAIp}:80" ]
+          [ "100.64.0.4:443" ]
         )
       ];
 

hosts/shan/default.nix

@@ -28,9 +28,6 @@
   };
 
   modules = {
-    meta = {
-      tailscale.ip = "100.64.0.4";
-    };
     system.networking.bluetooth.enable = true;
     container = {
       kitchenowl = {

options/meta.nix

@@ -1,7 +1,7 @@
 { lib, ... }:
 let
   inherit (lib) mkOption stringLength;
-  inherit (lib.types) str strMatching nullOr;
+  inherit (lib.types) str strMatching;
 
   validateUserName =
     x:
@@ -24,11 +24,5 @@ in
       # Should handle multiple users one day? maybe...
       description = "This system's primary user.";
     };
-    tailscale = {
-      ip = mkOption {
-        default = null;
-        type = nullOr str;
-      };
-    };
   };
 }