idk hard broken

2025-10-08 15:43:51 -05:00
parent 02b5dd32a2
commit 8677ca747a
14 changed files with 740 additions and 574 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -884,11 +884,11 @@
        "nixpkgs": "nixpkgs_11"
      },
      "locked": {
-        "lastModified": 1756774688,
-        "narHash": "sha256-st5xUV4Fj4Px5MOvQdF26TZRPzxz47wgRvDjSwiDDso=",
+        "lastModified": 1759767678,
+        "narHash": "sha256-+h+Go9D4tw1B9zRWmg84z8x+5p2maEfBwP9+XlzESBg=",
        "owner": "mjallen18",
        "repo": "nixos-raspberrypi",
-        "rev": "aeb17b185bb65a3fa1ef6803ead393e9e10d1f46",
+        "rev": "fcbfe3aa574abbaddb9aef972da162cbe30703f7",
        "type": "github"
      },
      "original": {
@@ -994,11 +994,11 @@
    },
    "nixpkgs_11": {
      "locked": {
-        "lastModified": 1756515621,
-        "narHash": "sha256-cYPwtXNlQ18FBuMVJ4RltuCym2Acy/6O+i/fJ4UnEn8=",
+        "lastModified": 1758583444,
+        "narHash": "sha256-OnYthHIsVIMrZDWtCEp6Zde8ZtMcEBnpyCIdtTKU7bo=",
        "owner": "nvmd",
        "repo": "nixpkgs",
-        "rev": "b143badd3dea297d6ba0dc93397c0ebc2838c508",
+        "rev": "d8551a2038e21091fce8157e070bdb25dca0a94f",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -213,6 +213,7 @@
              nixos-raspberrypi.nixosModules.raspberry-pi-5.base
              nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4
              nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth
+              nixos-raspberrypi.nixosModules.raspberry-pi-5.page-size-16k
              nixos-raspberrypi.nixosModules.nixpkgs-rpi
              nixos-raspberrypi.nixosModules.trusted-nix-caches
              nixos-raspberrypi.lib.inject-overlays
--- a/modules/nixos/programs/default.nix
+++ b/modules/nixos/programs/default.nix
@@ -62,7 +62,7 @@
        libgbm
      ];
    };
-    seahorse.enable = lib.mkDefault true;
+    seahorse.enable = lib.mkDefault false;
  };
  environment = {
    systemPackages = with pkgs; [
--- a/modules/nixos/services/actual/default.nix
+++ b/modules/nixos/services/actual/default.nix
@@ -13,9 +13,7 @@ let
  actualUserId = config.users.users.nix-apps.uid;
  actualGroupId = config.users.groups.jallen-nas.gid;

-  actualConfig =
-    { lib, ... }:
-    {
+  actualConfig = {
    services.actual = {
      enable = true;
      openFirewall = true;
@@ -27,6 +25,7 @@ let
        userFiles = "${dataDir}/user-files";
      };
    };
+  };

    users.users.actual = {
      isSystemUser = true;
@@ -68,7 +67,7 @@ let
  };

  bindMounts = {
-    ${dataDir} = {
+    "${dataDir}" = {
      hostPath = cfg.dataDir;
      isReadOnly = false;
    };
@@ -93,7 +92,7 @@ let
      { inherit lib; };

  fullConfig = {
-    ${namespace}.services.traefik = lib.mkIf cfg.reverseProxy.enable {
+    "${namespace}".services.traefik = lib.mkIf cfg.reverseProxy.enable {
      reverseProxies = [ reverseProxyConfig ];
    };
  }
--- a/modules/nixos/services/arrs/default.nix
+++ b/modules/nixos/services/arrs/default.nix
@@ -8,83 +8,44 @@
 with lib;
 let
  cfg = config.${namespace}.services.arrs;
-  radarrDataDir = "/var/lib/radarr";
-  downloadDir = "/downloads";
-  incompleteDir = "/downloads-incomplete";
-  sonarrDataDir = "/var/lib/sonarr";
-  sabnzbdConfig = "/var/lib/sabnzbd";
-  jackettDir = "/var/lib/jackett/.config/Jackett";
-  mediaDir = "/media";
-  arrUserId = config.users.users.nix-apps.uid;
-  arrGroupId = config.users.groups.jallen-nas.gid;
-  radarrPkg = pkgs.radarr;
-  sonarrPkg = pkgs.sonarr;
-  delugePkg = pkgs.deluge;
-  jackettPkg = pkgs.jackett;
 in
 {
  imports = [ ./options.nix ];

  config = mkIf cfg.enable {
-    containers.arrs = {
-      autoStart = true;
-      privateNetwork = true;
-      hostAddress = "10.0.1.3";
-      localAddress = cfg.localAddress;
-
-      config =
-        {
-          pkgs,
-          lib,
-          ...
-        }:
-        {
-          nixpkgs.config = {
-            allowUnfree = lib.mkForce true;
-            allowUnfreePredicate =
-              pkg:
-              builtins.elem (lib.getName pkg) [
-                "unrar"
-              ];
-          };
-
    # Enable radarr service
    services.radarr = {
      enable = cfg.radarr.enable;
      openFirewall = true;
-            user = "arrs";
-            group = "media";
-            dataDir = radarrDataDir;
-            package = radarrPkg;
+      user = "nix-apps";
+      group = "jallen-nas";
+      dataDir = cfg.radarr.dataDir;
    };

    # Enable Sonarr service
    services.sonarr = {
      enable = cfg.sonarr.enable;
      openFirewall = true;
-            user = "arrs";
-            group = "media";
-            dataDir = sonarrDataDir;
-            package = sonarrPkg;
+      user = "nix-apps";
+      group = "jallen-nas";
+      dataDir = cfg.sonarr.dataDir;
    };

    # Enable Sabnzbd service
    services.sabnzbd = {
      enable = cfg.sabnzbd.enable;
-            openFirewall = true;
-            user = "arrs";
-            group = "media";
-            configFile = "${sabnzbdConfig}/sabnzbd.ini";
-            package = pkgs.sabnzbd;
+      # openFirewall = true;
+      user = "nix-apps";
+      group = "jallen-nas";
+      configFile = "${cfg.sabnzbd.dataDir}/sabnzbd.ini";
    };

    services.deluge = {
      enable = cfg.deluge.enable;
-            user = "arrs";
-            group = "media";
+      user = "nix-apps";
+      group = "jallen-nas";
      openFirewall = true;
-            dataDir = "/media";
-            package = delugePkg;
+      dataDir = "/media/nas/main";
      web = {
        enable = true;
        port = cfg.deluge.port;
@@ -94,164 +55,9 @@ in

    services.jackett = {
      enable = cfg.jackett.enable;
-            user = "arrs";
-            group = "media";
+      user = "nix-apps";
+      group = "jallen-nas";
      openFirewall = true;
-            package = jackettPkg;
-          };
-
-          # Create required users and groups
-          users.users.arrs = {
-            isSystemUser = true;
-            uid = lib.mkForce arrUserId;
-            group = "media";
-            extraGroups = [ "downloads" ];
-          };
-
-          users.groups = {
-            media = {
-              gid = lib.mkForce arrGroupId;
-            };
-            downloads = { };
-          };
-
-          # System packages
-          environment.systemPackages = with pkgs; [
-            glib
-            sqlite
-            mono
-            mediainfo
-            protonvpn-cli_2
-          ];
-
-          # Create and set permissions for required directories
-          system.activationScripts.arr-dirs = ''
-            mkdir -p ${radarrDataDir}
-            mkdir -p ${sonarrDataDir}
-            mkdir -p ${sabnzbdConfig}
-            mkdir -p ${downloadDir}
-            mkdir -p ${incompleteDir}
-            mkdir -p ${mediaDir}
-
-            chown -R arrs:media ${radarrDataDir}
-            chown -R arrs:media ${sonarrDataDir}
-            chown -R arrs:media ${sabnzbdConfig}
-            chown -R arrs:media ${downloadDir}
-            chown -R arrs:media ${incompleteDir}
-            chown -R arrs:media ${mediaDir}
-
-            chmod -R 775 ${radarrDataDir}
-            chmod -R 775 ${sonarrDataDir}
-            chmod -R 775 ${sabnzbdConfig}
-            chmod -R 775 ${downloadDir}
-            chmod -R 775 ${incompleteDir}
-            chmod -R 775 ${mediaDir}
-
-          '';
-
-          networking = {
-            firewall = {
-              enable = true;
-              allowedTCPPorts = [
-                cfg.radarr.port
-                cfg.sonarr.port
-                cfg.sabnzbd.port
-                8080
-              ];
-            };
-            # Use systemd-resolved inside the container
-            # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
-            useHostResolvConf = lib.mkForce false;
-          };
-
-          services.resolved.enable = true;
-          system.stateVersion = "23.11";
-        };
-
-      # Bind mount directories from host
-      bindMounts = {
-        "${radarrDataDir}" = {
-          hostPath = cfg.radarr.dataDir;
-          isReadOnly = false;
-        };
-        "${sonarrDataDir}" = {
-          hostPath = cfg.sonarr.dataDir;
-          isReadOnly = false;
-        };
-        "${sabnzbdConfig}" = {
-          hostPath = cfg.sabnzbd.dataDir;
-          isReadOnly = false;
-        };
-        "${downloadDir}" = {
-          hostPath = cfg.downloadsDir;
-          isReadOnly = false;
-        };
-        "${incompleteDir}" = {
-          hostPath = cfg.incompleteDownloadsDir;
-          isReadOnly = false;
-        };
-        "${jackettDir}" = {
-          hostPath = cfg.jackett.dataDir;
-          isReadOnly = false;
-        };
-        "/media/movies" = {
-          hostPath = cfg.moviesDir;
-          isReadOnly = false;
-        };
-        "/media/tv" = {
-          hostPath = cfg.tvDir;
-          isReadOnly = false;
-        };
-        "/media/isos" = {
-          hostPath = cfg.isosDir;
-          isReadOnly = false;
-        };
-      };
-    };
-
-    networking = {
-      nat = {
-        forwardPorts = [
-          {
-            destination = "${cfg.localAddress}:${toString cfg.radarr.port}";
-            sourcePort = cfg.radarr.port;
-          }
-          {
-            destination = "${cfg.localAddress}:${toString cfg.sonarr.port}";
-            sourcePort = cfg.sonarr.port;
-          }
-          {
-            destination = "${cfg.localAddress}:8080";
-            sourcePort = cfg.sabnzbd.port;
-          }
-          {
-            destination = "${cfg.localAddress}:${toString cfg.deluge.port}";
-            sourcePort = cfg.deluge.port;
-          }
-          {
-            destination = "${cfg.localAddress}:${toString cfg.jackett.port}";
-            sourcePort = cfg.jackett.port;
-          }
-        ];
-      };
-      firewall = {
-        allowedTCPPorts = [
-          cfg.radarr.port
-          cfg.sonarr.port
-          cfg.sabnzbd.port
-          8080
-          cfg.deluge.port
-          cfg.jackett.port
-        ];
-        allowedUDPPorts = [
-          cfg.radarr.port
-          cfg.sonarr.port
-          cfg.sabnzbd.port
-          8080
-          cfg.deluge.port
-          cfg.jackett.port
-        ];
-      };
    };
  };
 }
--- a/modules/nixos/services/arrs/default.nix.container
+++ b/modules/nixos/services/arrs/default.nix.container
@@ -0,0 +1,261 @@
+{
+  config,
+  pkgs,
+  lib,
+  namespace,
+  ...
+}:
+with lib;
+let
+  cfg = config.${namespace}.services.arrs;
+  radarrDataDir = "/var/lib/radarr";
+  downloadDir = "/downloads";
+  incompleteDir = "/downloads-incomplete";
+  sonarrDataDir = "/var/lib/sonarr";
+  sabnzbdConfig = "/var/lib/sabnzbd";
+  jackettDir = "/var/lib/jackett/.config/Jackett";
+  mediaDir = "/media";
+  arrUserId = config.users.users.nix-apps.uid;
+  arrGroupId = config.users.groups.jallen-nas.gid;
+  radarrPkg = pkgs.radarr;
+  sonarrPkg = pkgs.sonarr;
+  delugePkg = pkgs.deluge;
+  jackettPkg = pkgs.jackett;
+in
+{
+  imports = [ ./options.nix ];
+
+  config = mkIf cfg.enable {
+    containers.arrs = {
+      autoStart = true;
+      privateNetwork = true;
+      hostAddress = "10.0.1.3";
+      localAddress = cfg.localAddress;
+
+      config =
+        {
+          pkgs,
+          lib,
+          ...
+        }:
+        {
+          nixpkgs.config = {
+            allowUnfree = lib.mkForce true;
+            allowUnfreePredicate =
+              pkg:
+              builtins.elem (lib.getName pkg) [
+                "unrar"
+              ];
+          };
+
+          # Enable radarr service
+          services.radarr = {
+            enable = cfg.radarr.enable;
+            openFirewall = true;
+            user = "arrs";
+            group = "media";
+            dataDir = radarrDataDir;
+            package = radarrPkg;
+          };
+
+          # Enable Sonarr service
+          services.sonarr = {
+            enable = cfg.sonarr.enable;
+            openFirewall = true;
+            user = "arrs";
+            group = "media";
+            dataDir = sonarrDataDir;
+            package = sonarrPkg;
+          };
+
+          # Enable Sabnzbd service
+          services.sabnzbd = {
+            enable = cfg.sabnzbd.enable;
+            openFirewall = true;
+            user = "arrs";
+            group = "media";
+            configFile = "${sabnzbdConfig}/sabnzbd.ini";
+            package = pkgs.sabnzbd;
+          };
+
+          services.deluge = {
+            enable = cfg.deluge.enable;
+            user = "arrs";
+            group = "media";
+            openFirewall = true;
+            dataDir = "/media";
+            package = delugePkg;
+            web = {
+              enable = true;
+              port = cfg.deluge.port;
+              openFirewall = true;
+            };
+          };
+
+          services.jackett = {
+            enable = cfg.jackett.enable;
+            user = "arrs";
+            group = "media";
+            openFirewall = true;
+            package = jackettPkg;
+          };
+
+          # Create required users and groups
+          users.users.arrs = {
+            isSystemUser = true;
+            uid = lib.mkForce arrUserId;
+            group = "media";
+            extraGroups = [ "downloads" ];
+          };
+
+          users.groups = {
+            media = {
+              gid = lib.mkForce arrGroupId;
+            };
+            downloads = { };
+          };
+
+          # System packages
+          environment.systemPackages = with pkgs; [
+            glib
+            sqlite
+            mono
+            mediainfo
+            protonvpn-cli_2
+          ];
+
+          # Create and set permissions for required directories
+          system.activationScripts.arr-dirs = ''
+            mkdir -p ${radarrDataDir}
+            mkdir -p ${sonarrDataDir}
+            mkdir -p ${sabnzbdConfig}
+            mkdir -p ${downloadDir}
+            mkdir -p ${incompleteDir}
+            mkdir -p ${mediaDir}
+
+            chown -R arrs:media ${radarrDataDir}
+            chown -R arrs:media ${sonarrDataDir}
+            chown -R arrs:media ${sabnzbdConfig}
+            chown -R arrs:media ${downloadDir}
+            chown -R arrs:media ${incompleteDir}
+            chown -R arrs:media ${mediaDir}
+
+            chmod -R 775 ${radarrDataDir}
+            chmod -R 775 ${sonarrDataDir}
+            chmod -R 775 ${sabnzbdConfig}
+            chmod -R 775 ${downloadDir}
+            chmod -R 775 ${incompleteDir}
+            chmod -R 775 ${mediaDir}
+
+          '';
+
+          networking = {
+            firewall = {
+              enable = true;
+              allowedTCPPorts = [
+                cfg.radarr.port
+                cfg.sonarr.port
+                cfg.sabnzbd.port
+                8080
+              ];
+            };
+            # Use systemd-resolved inside the container
+            # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
+            useHostResolvConf = lib.mkForce false;
+          };
+
+          services.resolved.enable = true;
+          system.stateVersion = "23.11";
+        };
+
+      # Bind mount directories from host
+      bindMounts = {
+        "/etc/resolv.conf" = {
+          hostPath = "/etc/resolv.conf";
+          isReadOnly = true;
+        };
+        "${radarrDataDir}" = {
+          hostPath = cfg.radarr.dataDir;
+          isReadOnly = false;
+        };
+        "${sonarrDataDir}" = {
+          hostPath = cfg.sonarr.dataDir;
+          isReadOnly = false;
+        };
+        "${sabnzbdConfig}" = {
+          hostPath = cfg.sabnzbd.dataDir;
+          isReadOnly = false;
+        };
+        "${downloadDir}" = {
+          hostPath = cfg.downloadsDir;
+          isReadOnly = false;
+        };
+        "${incompleteDir}" = {
+          hostPath = cfg.incompleteDownloadsDir;
+          isReadOnly = false;
+        };
+        "${jackettDir}" = {
+          hostPath = cfg.jackett.dataDir;
+          isReadOnly = false;
+        };
+        "/media/movies" = {
+          hostPath = cfg.moviesDir;
+          isReadOnly = false;
+        };
+        "/media/tv" = {
+          hostPath = cfg.tvDir;
+          isReadOnly = false;
+        };
+        "/media/isos" = {
+          hostPath = cfg.isosDir;
+          isReadOnly = false;
+        };
+      };
+    };
+
+    networking = {
+      nat = {
+        forwardPorts = [
+          {
+            destination = "${cfg.localAddress}:${toString cfg.radarr.port}";
+            sourcePort = cfg.radarr.port;
+          }
+          {
+            destination = "${cfg.localAddress}:${toString cfg.sonarr.port}";
+            sourcePort = cfg.sonarr.port;
+          }
+          {
+            destination = "${cfg.localAddress}:8080";
+            sourcePort = cfg.sabnzbd.port;
+          }
+          {
+            destination = "${cfg.localAddress}:${toString cfg.deluge.port}";
+            sourcePort = cfg.deluge.port;
+          }
+          {
+            destination = "${cfg.localAddress}:${toString cfg.jackett.port}";
+            sourcePort = cfg.jackett.port;
+          }
+        ];
+      };
+      firewall = {
+        allowedTCPPorts = [
+          cfg.radarr.port
+          cfg.sonarr.port
+          cfg.sabnzbd.port
+          8080
+          cfg.deluge.port
+          cfg.jackett.port
+        ];
+        allowedUDPPorts = [
+          cfg.radarr.port
+          cfg.sonarr.port
+          cfg.sabnzbd.port
+          8080
+          cfg.deluge.port
+          cfg.jackett.port
+        ];
+      };
+    };
+  };
+}
--- a/modules/nixos/services/gitea/default.nix
+++ b/modules/nixos/services/gitea/default.nix
@@ -8,17 +8,31 @@ with lib;
 let
  cfg = config.${namespace}.services.gitea;
  rootUrl = "https://gitea.mjallen.dev/";
-  dataDir = "/var/lib/gitea";
-  secretsDir = "/run/secrets/jallen-nas/gitea";
  mailerPasswordFile = config.sops.secrets."jallen-nas/gitea/mail-key".path;
  metricsTokenFile = config.sops.secrets."jallen-nas/gitea/metrics-key".path;

-  serviceConfig =
-    { ... }:
+  # Create reverse proxy configuration using mkReverseProxy
+  reverseProxyConfig = lib.${namespace}.mkReverseProxy {
+    name = "gitea";
+    subdomain = cfg.reverseProxy.subdomain;
+    url = "http://${cfg.localAddress}:${toString cfg.httpPort}";
+    middlewares = cfg.reverseProxy.middlewares;
+  };
+
+  traefik = {
+    "${namespace}".services.traefik = lib.mkIf cfg.reverseProxy.enable {
+      reverseProxies = [ reverseProxyConfig ];
+    };
+  };
+in
 {
+  imports = [ ./options.nix ];
+  config = mkIf cfg.enable {
    services.gitea = {
      enable = true;
-        stateDir = dataDir;
+      stateDir = cfg.dataDir;
+      user = "nix-apps";
+      group = "jallen-nas";
      mailerPasswordFile = mailerPasswordFile;
      metricsTokenFile = metricsTokenFile;
      settings = {
@@ -43,63 +57,5 @@ let
        };
      };
    };
-
-      users.users.gitea = {
-        extraGroups = [ "keys" ];
-      };
-
-      # Create and set permissions for required directories
-      system.activationScripts.gitea-dirs = ''
-        mkdir -p /var/lib/gitea
-        chown -R gitea:gitea /var/lib/gitea
-        chmod -R 775 /var/lib/gitea
-        mkdir -p /run/secrets/jallen-nas
-        chown -R gitea:gitea /run/secrets/jallen-nas
-        chmod -R 775 /run/secrets/jallen-nas
-      '';
-    };
-
-  bindMounts = {
-    ${dataDir} = {
-      hostPath = cfg.dataDir;
-      isReadOnly = false;
-    };
-    secrets = {
-      hostPath = secretsDir;
-      isReadOnly = true;
-      mountPoint = secretsDir;
-    };
-  };
-
-  # Create reverse proxy configuration using mkReverseProxy
-  reverseProxyConfig = lib.${namespace}.mkReverseProxy {
-    name = "gitea";
-    subdomain = cfg.reverseProxy.subdomain;
-    url = "http://${cfg.localAddress}:${toString cfg.httpPort}";
-    middlewares = cfg.reverseProxy.middlewares;
-  };
-
-  containerConfig =
-    (lib.${namespace}.mkContainer {
-      name = "gitea";
-      localAddress = cfg.localAddress;
-      ports = [
-        cfg.httpPort
-        cfg.sshPort
-      ];
-      bindMounts = bindMounts;
-      config = serviceConfig;
-    })
-      { inherit lib; };
-
-  giteaConfig = {
-    ${namespace}.services.traefik = lib.mkIf cfg.reverseProxy.enable {
-      reverseProxies = [ reverseProxyConfig ];
-    };
-  }
-  // containerConfig;
-in
-{
-  imports = [ ./options.nix ];
-  config = mkIf cfg.enable giteaConfig;
+  } // traefik;
 }
--- a/modules/nixos/services/gitea/default.nix.container
+++ b/modules/nixos/services/gitea/default.nix.container
@@ -0,0 +1,116 @@
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
+with lib;
+let
+  cfg = config.${namespace}.services.gitea;
+  rootUrl = "https://gitea.mjallen.dev/";
+  dataDir = "/var/lib/gitea";
+  secretsDir = "/run/secrets/jallen-nas/gitea";
+  mailerPasswordFile = config.sops.secrets."jallen-nas/gitea/mail-key".path;
+  metricsTokenFile = config.sops.secrets."jallen-nas/gitea/metrics-key".path;
+  giteaUid = config.users.users.nix-apps.uid;
+  giteaGid = config.users.groups.jallen-nas.gid;
+
+  serviceConfig = {
+    services.gitea = {
+      enable = true;
+      stateDir = dataDir;
+      mailerPasswordFile = mailerPasswordFile;
+      metricsTokenFile = metricsTokenFile;
+      settings = {
+        server = {
+          DOMAIN = "jallen-nas";
+          HTTP_ADDR = "0.0.0.0";
+          HTTP_PORT = cfg.httpPort;
+          PROTOCOL = "http";
+          ROOT_URL = rootUrl;
+          START_SSH_SERVER = true;
+          SSH_PORT = cfg.sshPort;
+        };
+        service = {
+          REGISTER_EMAIL_CONFIRM = false;
+          ENABLE_CAPTCHA = false;
+          DISABLE_REGISTRATION = true;
+          ENABLE_OPENID_SIGNIN = false;
+          ENABLE_LDAP_SIGNIN = false;
+          ENABLE_SSH_SIGNIN = true;
+          ENABLE_BUILTIN_SSH_SERVER = true;
+          ENABLE_REVERSE_PROXY_AUTHENTICATION = true;
+        };
+      };
+    };
+
+    users = {
+      users.gitea = {
+        isSystemUser = true;
+        isNormalUser = false;
+        uid = lib.mkForce giteaUid;
+        group = "gitea";
+        extraGroups = [ "keys" ];
+      };
+      groups = {
+        gitea = {
+          gid = lib.mkForce giteaGid;
+        };
+      };
+    };
+
+    # Create and set permissions for required directories
+    system.activationScripts.gitea-dirs = ''
+      mkdir -p /var/lib/gitea
+      chown -R gitea:gitea /var/lib/gitea
+      chmod -R 775 /var/lib/gitea
+      mkdir -p /run/secrets/jallen-nas
+      chown -R gitea:gitea /run/secrets/jallen-nas
+      chmod -R 775 /run/secrets/jallen-nas
+    '';
+  };
+
+  bindMounts = {
+    "${dataDir}" = {
+      hostPath = cfg.dataDir;
+      isReadOnly = false;
+    };
+    secrets = {
+      hostPath = secretsDir;
+      isReadOnly = true;
+      mountPoint = secretsDir;
+    };
+  };
+
+  # Create reverse proxy configuration using mkReverseProxy
+  reverseProxyConfig = lib.${namespace}.mkReverseProxy {
+    name = "gitea";
+    subdomain = cfg.reverseProxy.subdomain;
+    url = "http://${cfg.localAddress}:${toString cfg.httpPort}";
+    middlewares = cfg.reverseProxy.middlewares;
+  };
+
+  containerConfig =
+    (lib.${namespace}.mkContainer {
+      name = "gitea";
+      localAddress = cfg.localAddress;
+      ports = [
+        cfg.httpPort
+        cfg.sshPort
+      ];
+      bindMounts = bindMounts;
+      config = serviceConfig;
+    })
+      { inherit lib; };
+
+  giteaConfig = {
+    "${namespace}".services.traefik = lib.mkIf cfg.reverseProxy.enable {
+      reverseProxies = [ reverseProxyConfig ];
+    };
+  }
+  // containerConfig;
+in
+{
+  imports = [ ./options.nix ];
+  config = mkIf cfg.enable giteaConfig;
+}
--- a/modules/nixos/services/traefik/default.nix
+++ b/modules/nixos/services/traefik/default.nix
@@ -297,6 +297,12 @@ in
              }
            ];

+            gitea.loadBalancer.servers = [
+              {
+                url = "http://10.0.1.3:3000";
+              }
+            ];
+
            authentik.loadBalancer.servers = [
              {
                url = authentikUrl;
@@ -369,6 +375,17 @@ in
              tls.certResolver = "letsencrypt";
            };

+            gitea = {
+              entryPoints = [ "websecure" ];
+              rule = "Host(`gitea.${domain}`)";
+              service = "gitea";
+              middlewares = [
+                "crowdsec"
+                "whitelist-geoblock"
+              ];
+              tls.certResolver = "letsencrypt";
+            };
+
            authentik = {
              entryPoints = [ "websecure" ];
              rule = "Host(`authentik.${domain}`)";
--- a/overlays/rcon/default.nix
+++ b/overlays/rcon/default.nix
@@ -0,0 +1,5 @@
+{ inputs, ... }:
+final: _prev: {
+  # rcon = inputs.nixpkgs-stable.legacyPackages."x86_64-linux".rcon;
+  # llama-cpp = inputs.nixpkgs-stable.legacyPackages."x86_64-linux".llama-cpp;
+}
--- a/secrets/nas-secrets.yaml
+++ b/secrets/nas-secrets.yaml
@@ -1,6 +1,6 @@
 jallen-nas:
    admin_password: ENC[AES256_GCM,data:0XUblR800UyliA8JfYUZbncDRxiU6eoTaf3i80+OCwJ/31oBhSqj9OtgYeRg3IyURwik1Nk/609IuHjIhly3mgTjOD6Hpzxpag==,iv:0yO3z8ItHRQFeI9JOnFTKhKVHi5u9cMtpglFRlkvYLE=,tag:iUd79iWAJQ9iqP0qolSwfA==,type:str]
-  nas_pool: ENC[AES256_GCM,data:sx78UwPhgklzf8e/Tjw/2esAspMFTnSj3ahEtv3btVLpotwE9UDMtFGPkkh8r82mGLmzC3dRsWYaOAFW4ioVBpmiochpdAR+QfmOBgsOFQPKdqlF0DDXcElT+qxhJ9Uoo26v0XZwaTdplI9f8OTxCPZtihX4Y27sFNjhCM9loN+IJKqxPFNaK4RRJtFQL5sG2OaiPkSd/Wf082RTW12CNWYRY2RSTCqzKB7YclTcAAwdj72uJTER7uU8Fr4/PpUN7AJ/GGK9OetY5QbkieelwESBqQR12CLCF1/d82CaN/lL8jtuc3Q7QFsRGr28fHBNqOywkJ6aNxxZCKS0fjQGpasroQtt5fv8pNMs7Gu67SiuKGb/z0wKdd5c03sxD/42bSf2aM1vUW8Bm6PGGVk8OT0UWMA9FhbWeVr3HSb6gFktOlC3oRLGPUU3WcdkLAmqCWtSQuVHNx6/s/JDj8UyWqyDCu/7afxKX9gt+I6G+3EWmVs/fi91+tpYd5hyhTBFmOoC+wooVqnGVXtM7cUbWTJS4Ua82zcroHj+KKoX5sOOzOXfI9TVRLccPYlbdSY46467+ycEXsc7cxnigKerO29GhFFoC3pGxwwBcMYWDl8466H7cCDpYohPdY/q9dYuB3LBEzFizmANQ/kGEkZt1I1fydO+sN5ZcTyhnOCHQFI9lYPDsQ6Gztb4n8PEHYdHbp1Zue0p82H8hhgC4v2ne2GezdiYRCl1y2MZvF8CgkwAw/PkX2cb8CAMuG0ZHtOLFwUPjPk2KCe8G6yK0SekE/Zm36wlPz8yLd9S2dLRBcxXZiQEHXqONjVGf3fhbE8QyDZ83xITlRTnbQt1rF0vPrgeJD/m3u4QMo1BrF6EIsCCesQrNPLRRGddh7uyhVX9OKy633OKxLy2Gt1VjfuE77ZaPmNgIjk1geCXuKUFD/BC9DJiknVuajS8tFHIIh7YYUBZY/Q=,iv:ZvI+1L4Zwgwz0t++fvVxX7HXXuS8G8DcKz7WDlq9oS8=,tag:sbXluJh9CQhJH11gk2Ohfg==,type:str]
+    nas_pool: ENC[AES256_GCM,data:LBiUC/5qMFUnWUWYZgRPrGopdPd6oWB0+xe1S+GiOMtSIsBH34ZoE8U/v1HmxR17mt0x169xq7iXAQZTCZ/Vd8KGmecTK7hC+H6kmSUcwsuoPiVyoSPdet3Zb716eXGWmnSD6QlReUpq6xiCqOwKUkgNgRtkdc92PAEcmbrw1tfooxTesxB3n9pSCXAkwsPxJWl7nLrCZIf6wOZci/TiwFJf534/YPKIz8q5JxX+E+VeQ4NNRfZxn4EqlMDgmNcEcuHdflqTNAlDmREqhN0XNREUaFveQ01T5sFb6XHorEHpUlKIzDpMV4LKjZQMZax4T+6nbGpUa5kf/Gr3xeOpMpTGNir1bM8oPQGP/Iz9u4AjGP56+JYcqUBcxG1wwNFIqBrrC+Bf7vdjGxgMClwW5AbMtGXwE9y+dSM9MMkj8kiaK1zWZfyIqRBheXtXUhPIjJSR8fmnVtKW358E7ynC9R14AsA3qxpxEc4+VmF7cJEzjStP//FRSuUFRlvgIcGBfncvt0b+ecEk8WostYAMHhqpyHtW2hG5orv6qFupLz0VCBbFLqlIEMG1d/EfjulGqWN4fGIhlAGpssvuo8r/9bOz4efTwODnKJqX5YfOPhFDAJZzj7pgFgAjf8/xAgelAU1yR3nlj2PR9itEAApY0L0FvnC4fEMBqlpINM8gGeNcfTraIYo7bqVhOT5sVOXmru+nRoyG1I01rJ1lQpis5Kqt+HWGa43fi81dtTm7kj/4bOPSPrJimIOD37O3GRlbiiGIhy/Ta/iVqzRsYeUZOyIQT+IjZ4pX5tgJ/AxASVzdRd9GluexPdUGVDb9Kjf7mo7aYsXyWDBP7ZoXDQGHndrlTlrQreDLgcwCXo1hHEn9YkIUfYpBd5Th7LJrsaNWXH838S+9sDqSCGdVPVcH0HC8x5T5Uo3Jb833uaQjtaXsSaAgaRkcEtAHz4LO5kKii3AgP0vA,iv:ny8qQhSrfokW3iS0KXtCVYgtvj07c25jfEUCIExD7eI=,tag:QD8C37p3gUJr42NHiL7PHw==,type:str]
    ups_password: ENC[AES256_GCM,data:tYuJ9nU3E2/Ko6Y=,iv:lQq+g68lKCp1rmPvS/84xGIXHxD9zY5zZrrjEJlY8Hs=,tag:p6McEr+sXGAQyMAz1Kaxfw==,type:str]
    authentik-env: ENC[AES256_GCM,data:AzHHGyhoyMp/ebnK6LQ5apBUhQT04SPJrtA6XcdaQ38C+fYuG2ph2iWFb+giafxCe8IXWAYT8CWoeqcspM7CPSAAKgqfVaPhMvjXqLxCY/rpegb5jBD1U6tURhPsH3ADrERk+kCmTV2eUpuV+nluiGM+fRdwhB0zu378HKwhXCpSO4L24aXhe9pxxxaTQzncWH6zW5iaRdouDVr1bAUzLi9BpnmS0ZK/rfLq2whErCeN++Srx6aCgwJ7jaqetBglQkIl3YG6flS8u3vsKtI+RVaNJ5tzrWR/qv0vBy8y1PZEuuXZdiHjn1hjiPE1T31j2+aQdbX70RaJfIt6E4lVtArQHv8PTUDxUoxcnUv52xLTStT5/UdIlNoZjPMwvaknpK7Z0uw9w4j76gmgk06xsxoCpnXIGTm1QpGqviBhgfNs5Va/qi4MBfByaym3UAz9LPHs4keuvJNN8dS0q5OMnRswl14PjIb1MIKB/QCVHvb4hO7eIRiWOkA7nb9LP/y1mjAYslr+I+GNpU8oIYTAvKoMS7ZgC49RoLWytAXUru2I7CqDR9zgPzlDQ9gLPoFKw2uKulpAy0ayQWPcgPA2CFmF+5zdINNSNKn0gRZ/2RTc3DiWmzo4P13EmrOwvkWCkiswFu1d6ctKZFhQnfPuj9LRGp/Os55JpLrreSyRJug6lgR4bPdC3x8sbxNmb5S2Y+4aFfgPXfdCdXs5b+8j28d1d4EoOO/arUzNADz9ODD5esb2g8UC2QtQd0RRYX/qmiM=,iv:YKvFxz3M8HKlg56JfN6uv8hvCFlEbhBkaSQz1v9l3zk=,tag:rz7UixSDqOXH7Ga6mkVYAw==,type:str]
    traefik:
@@ -174,8 +174,8 @@ sops:
            NXZkbVZyV0VtTzArOE1uU1JwMXZZN0EKLDU1x+rIWecDD9x//huoM2BM9NRSa4g1
            L5nodU/J0XsfB9z3kr7eY5LYSwsqGkAxI1cXJYZGHF+bozJjweyXTQ==
            -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2025-09-30T23:04:02Z"
-  mac: ENC[AES256_GCM,data:rDWyDZSXNGs2q4epxCQBI5Mj8E5Dpen6F6cUU7NxTVlOI933Gi12bdpuFghrjEf2S1Lk0u/duOM07q2NJrsMOgVPws2f/jzcCzcpPeaUsrD1vkQUpCr2hUKNjSIEbrrtwanm2vbr0LMV0noxFluf68fpeph+/ZMe8eqJjxXWK+A=,iv:DvmxVM7m76trz5aXx/Llsrqmk53uTipo4SHaOdc2YUM=,tag:cIC5iF7+iaIjwLiYR22exg==,type:str]
+    lastmodified: "2025-10-07T16:00:55Z"
+    mac: ENC[AES256_GCM,data:Z8H09wF7kYYZs7FU4qAvpJmo3wEsSKg5qML+Q57UGNzjoaBJFor60B0yW/vaLcALt4clcJHhsU2phoCqCh7SdlP/AlgE5u8pn6G8n3zXiWxXK1dqiJLqE8iIgye+BA0EMdV9zATwTAQJwK/BtIBitXP1nboWi73W0tj+RdMIkjg=,iv:31IqJSL+kZAGqeKnOnZr5A2A0GOR/njrQ6tZqpjSTVo=,tag:1u24sjA06D8RnW4T3S1QjA==,type:str]
    pgp:
        - created_at: "2025-08-24T02:21:34Z"
          enc: |-
@@ -198,4 +198,4 @@ sops:
            -----END PGP MESSAGE-----
          fp: CBCB9B18A6B8930B0B6ABFD1CCB8CBEB30633684
    unencrypted_suffix: _unencrypted
-  version: 3.10.2
+    version: 3.11.0
--- a/systems/x86_64-linux/jallen-nas/boot.nix
+++ b/systems/x86_64-linux/jallen-nas/boot.nix
@@ -5,7 +5,7 @@
  ...
 }:
 let
-  kernel = pkgs.linuxPackages;
+  kernel = pkgs.linuxPackages_latest;
 in
 {
  # Configure bootloader with lanzaboot and secureboot
@@ -19,7 +19,7 @@ in
      clevis = {
        enable = false;
        devices = {
-          "/dev/disk/by-label/nas_pool".secretFile = config.sops.secrets."jallen-nas/nas_pool".path;
+          "/dev/disk/by-label/nas_pool".secretFile = "/etc/clevis/nas_pool.jwe";
        };
      };
    };
--- a/systems/x86_64-linux/jallen-nas/default.nix
+++ b/systems/x86_64-linux/jallen-nas/default.nix
@@ -21,7 +21,7 @@ in
    ./sops.nix
  ];

-  services.kmscon.enable = true;
+  services.kmscon.enable = false;

  powerManagement.cpuFreqGovernor = "powersave";

@@ -36,7 +36,7 @@ in
    # #                   Desktop                     # #
    # ###################################################

-    desktop.cosmic = disabled;
+    desktop.cosmic = enabled;

    # ###################################################
    # #                 Development                   # #
@@ -58,8 +58,8 @@ in
    hardware = {
      disko = {
        enable = true;
-        enableSwap = true;
-        enableLuks = false;
+        enableSwap = false;
+        enableLuks = true;
      };

      amd = {
@@ -134,7 +134,7 @@ in
          10200
          10300
          8127
-          6060
+          8280
          9943 # onlyoffice
          4000 # netbootxyz
          4080 # netbootxyz
@@ -148,6 +148,8 @@ in
          9012

          8192
+          3000
+          2222
        ];
        allowedUDPPorts = config.${namespace}.network.firewall.allowedTCPPorts;
      };
@@ -245,13 +247,15 @@ in
    fsType = "bcachefs";
    mountPoint = "/media/nas/main";
    options = [
-      "noauto"
+      # "noauto"
      "nofail"
      # "x-systemd.mount-timeout=0"
      # "x-systemd.device-timeout=0"
    ];
  };

+  boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-partlabel/disk-main-jallen-nas-cryptroot";
+
  boot.initrd.systemd.services."unlock-bcachefs-media-nas-main".enable = false;
  systemd.services."unlock-bcachefs-media-nas-main".enable = false;

--- a/systems/x86_64-linux/jallen-nas/users.nix
+++ b/systems/x86_64-linux/jallen-nas/users.nix
@@ -21,6 +21,7 @@ in
          "jallen-nas"
          "docker"
          "podman"
+          "keys"
        ];
        hashedPasswordFile = passwordFile;
      };