fmt

2026-02-04 20:40:34 -06:00
parent 4d4808490b
commit a9c1d71495
14 changed files with 84 additions and 192 deletions
--- a/lib/module/default.nix
+++ b/lib/module/default.nix
@@ -226,7 +226,10 @@ rec {

    subdomain = mkOpt types.str name "subdomain of the service";

-    middlewares = mkOpt (types.listOf types.str) [ "crowdsec" "whitelist-geoblock" ] "List of middlewares to use";
+    middlewares = mkOpt (types.listOf types.str) [
+      "crowdsec"
+      "whitelist-geoblock"
+    ] "List of middlewares to use";
  };

  # Standard enable/disable patterns
--- a/modules/nixos/homeassistant/services/homeassistant/default.nix
+++ b/modules/nixos/homeassistant/services/homeassistant/default.nix
@@ -286,8 +286,10 @@ in
        ++ (with pkgs.${namespace}; [
          gehomesdk
          magicattr
+          pyoverseerr
          python-nanokvm
          python-roborock
+          wyzeapy
        ]);

      config = {
--- a/modules/nixos/services/traefik/default.nix
+++ b/modules/nixos/services/traefik/default.nix
@@ -8,46 +8,6 @@ with lib;
 let
  cfg = config.${namespace}.services.traefik;

-  # Process extraServices into service configurations
-  extraServiceConfigs =
-    let
-      makeService =
-        service:
-        nameValuePair service.name {
-          loadBalancer.servers = [
-            {
-              url = service.url;
-            }
-          ];
-        };
-    in
-    listToAttrs (map makeService cfg.extraServices);
-
-  # Process extraRouters into router configurations
-  extraRouterConfigs =
-    let
-      makeRouter =
-        router:
-        let
-          hostRule =
-            if router.subdomain == "" then
-              "Host(`${domain}`)"
-            else
-              "Host(`${router.subdomain}.${domain}`)";
-        in
-        nameValuePair router.subdomain {
-          entryPoints = router.entryPoints;
-          rule = hostRule;
-          service = router.service;
-          middlewares = router.middlewares ++ [
-            "crowdsec"
-            "whitelist-geoblock"
-          ];
-          tls.certResolver = "letsencrypt";
-        };
-    in
-    listToAttrs (map makeRouter cfg.extraRouters);
-
  # Process reverseProxies into service and router configurations
  reverseProxyServiceConfigs =
    let
@@ -69,7 +29,6 @@ let

  cacheUrl = "http://${serverIp}:9012";
  hassUrl = "http://10.0.1.4:8123";
-  lubeloggerUrl = "http://${serverIp}:6754";

  # Plugins
  traefikPlugins = {
@@ -230,9 +189,11 @@ in
          };
        };

-        api.dashboard = true;
-        # Access the Traefik dashboard on <Traefik IP>:8080 of your server
-        api.insecure = true;
+        # Access the Traefik dashboard on <Traefik IP>:8080
+        api = {
+          dashboard = true;
+          insecure = true;
+        };

        experimental = {
          plugins = traefikPlugins;
@@ -240,22 +201,6 @@ in
      };

      dynamicConfigOptions = {
-        # udp = {
-        #   services = {
-        #     wireguard.loadBalancer.servers = [
-        #       {
-        #         url = "localhost:51820";
-        #       }
-        #     ];
-        #   };
-        #   routers = {
-        #     wireguard = {
-        #       entryPoints = [ "websecure" ];
-        #       service = "wireguard";
-        #     };
-        #   };
-        # };
-
        http = {
          middlewares = {
            authentik = {
@@ -323,43 +268,6 @@ in
                ];
              };
            };
-            collabora-headers = {
-              headers = {
-                customRequestHeaders = {
-                  Upgrade = "websocket";
-                  Connection = "Upgrade";
-                  X-Forwarded-Proto = "https";
-                  X-Forwarded-Host = "office.mjallen.dev";
-                };
-                customResponseHeaders = {
-                  X-Frame-Options = "";
-                  Content-Security-Policy = "frame-ancestors https://cloud.mjallen.dev";
-                };
-                referrerPolicy = "no-referrer";
-                stsSeconds = "15552000";
-                stsPreload = "true";
-                stsIncludeSubdomains = "true";
-                forceSTSHeader = "true";
-                browserXssFilter = "true";
-              };
-            };
-            onlyoffice-headers = {
-              headers = {
-                customResponseHeaders = {
-                  X-Robots-Tag = "none";
-                  Strict-Transport-Security = "max-age=63072000";
-                  X-Forwarded-Proto = "https";
-                };
-                browserXssFilter = "true";
-                contentTypeNosniff = "true";
-                stsIncludeSubdomains = "true";
-                stsPreload = "true";
-                stsSeconds = "31536000";
-                forceSTSHeader = "true";
-                accessControlMaxAge = "15552000";
-                accesscontrolalloworiginlist = "*";
-              };
-            };
          };

          services = {
@@ -381,7 +289,6 @@ in
              }
            ];
          }
-          // extraServiceConfigs
          // reverseProxyServiceConfigs;

          routers = {
@@ -413,13 +320,12 @@ in
              middlewares = [
                "crowdsec"
                "whitelist-geoblock"
-                "authentik"
+                # "authentik"
              ];
              priority = 10;
              tls.certResolver = "letsencrypt";
            };
          }
-          // extraRouterConfigs
          // reverseProxyRouterConfigs;
        };
      };
--- a/packages/comfyui/.asddefault.nix
+++ b/packages/comfyui/.asddefault.nix
@@ -1,6 +1,5 @@
 {
  lib,
-  stdenv,
  fetchFromGitHub,
  python3Packages,
  ...
@@ -29,9 +28,7 @@ python3Packages.buildPythonPackage rec {

  ];

-  dependencies =
-    with python3Packages;
-    [
+  dependencies = with python3Packages; [
    aiohttp
    torch
    torchaudio
@@ -76,7 +73,6 @@ python3Packages.buildPythonPackage rec {
  # comfy-kitchen
  # comfy-aimdo

-
  # pythonImportsCheck = [ "roborock" ];

  meta = with lib; {
--- a/packages/comfyui/comfyui-desktop/default.nix
+++ b/packages/comfyui/comfyui-desktop/default.nix
@@ -1,7 +1,6 @@
 {
  stdenv,
  lib,
-  python3Packages,
  fetchFromGitHub,
  ...
 }:
--- a/packages/comfyui/comfyui-frontend/default.nix
+++ b/packages/comfyui/comfyui-frontend/default.nix
@@ -1,7 +1,6 @@
 {
  stdenv,
  lib,
-  python3Packages,
  fetchFromGitHub,
  ...
 }:
--- a/packages/comfyui/comfyui/default.nix
+++ b/packages/comfyui/comfyui/default.nix
@@ -46,9 +46,7 @@ let
    ++ (with pkgs.${namespace}; [
      comfy-aimdo
    ]);
-  pythonEnv = python3.withPackages (
-    _ps: dependencies
-  );
+  pythonEnv = python3.withPackages (_ps: dependencies);
 in
 stdenv.mkDerivation rec {
  pname = "comfy-ui";
--- a/packages/python/comfy-aimdo/default.nix
+++ b/packages/python/comfy-aimdo/default.nix
@@ -1,4 +1,4 @@
-{ python3Packages, fetchFromGitHub, lib, ... }:
+{ python3Packages, fetchFromGitHub, ... }:
 python3Packages.buildPythonPackage rec {
  pname = "comfy-aimdo";
  version = "0.1.7";
--- a/packages/python/comfy-kitchen/default.nix
+++ b/packages/python/comfy-kitchen/default.nix
@@ -1,4 +1,4 @@
-{ python3Packages, fetchurl, lib, ... }:
+{ python3Packages, fetchurl, ... }:
 python3Packages.buildPythonPackage rec {
  pname = "comfy-kitchen";
  version = "0.2.7";
--- a/systems/x86_64-linux/jallen-nas/default.nix
+++ b/systems/x86_64-linux/jallen-nas/default.nix
@@ -6,15 +6,7 @@
  ...
 }:
 let
-  inherit (lib.${namespace}) enabled disabled mkContainer;
-
-  testcontainer = mkContainer {
-    name = "testContainer";
-    localAddress = "10.1.1.3";
-    ports = [ 80 ];
-    bindMounts = { };
-    config = { };
-  };
+  inherit (lib.${namespace}) enabled disabled;
 in
 {
  imports = [
--- a/systems/x86_64-linux/jallen-nas/services.nix
+++ b/systems/x86_64-linux/jallen-nas/services.nix
@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
  pkgs,
  ...
 }:
--- a/systems/x86_64-linux/jallen-nas/vpn.nix
+++ b/systems/x86_64-linux/jallen-nas/vpn.nix
@@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }:
 # let