fmt

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

modules/nixos/homeassistant/services/homeassistant/default.nix

@@ -286,8 +286,10 @@ in
         ++ (with pkgs.${namespace}; [
           gehomesdk
           magicattr
+          pyoverseerr
           python-nanokvm
           python-roborock
+          wyzeapy
         ]);
 
       config = {

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

packages/comfyui/.asddefault.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   python3Packages,
   ...
@@ -29,9 +28,7 @@ python3Packages.buildPythonPackage rec {
 
   ];
 
-  dependencies =
+  dependencies = with python3Packages; [
-    with python3Packages;
-    [
     aiohttp
     torch
     torchaudio
@@ -76,7 +73,6 @@ python3Packages.buildPythonPackage rec {
   # comfy-kitchen
   # comfy-aimdo
 
-
   # pythonImportsCheck = [ "roborock" ];
 
   meta = with lib; {

packages/comfyui/comfyui-desktop/default.nix

@@ -1,7 +1,6 @@
 {
   stdenv,
   lib,
-  python3Packages,
   fetchFromGitHub,
   ...
 }:

packages/comfyui/comfyui-frontend/default.nix

@@ -1,7 +1,6 @@
 {
   stdenv,
   lib,
-  python3Packages,
   fetchFromGitHub,
   ...
 }:

packages/comfyui/comfyui/default.nix

@@ -46,9 +46,7 @@ let
     ++ (with pkgs.${namespace}; [
       comfy-aimdo
     ]);
-  pythonEnv = python3.withPackages (
+  pythonEnv = python3.withPackages (_ps: dependencies);
-    _ps: dependencies
-  );
 in
 stdenv.mkDerivation rec {
   pname = "comfy-ui";

packages/python/comfy-aimdo/default.nix

@@ -1,9 +1,9 @@
-{ python3Packages, fetchFromGitHub, lib, ... }:
+{ python3Packages, fetchFromGitHub, ... }:
 python3Packages.buildPythonPackage rec {
   pname = "comfy-aimdo";
   version = "0.1.7";
   format = "pyproject";
-# Comfy-Org/comfy-aimdo/releases/tag/v0.1.7
+  # Comfy-Org/comfy-aimdo/releases/tag/v0.1.7
   src = fetchFromGitHub {
     owner = "Comfy-Org";
     repo = "comfy-aimdo";

packages/python/comfy-kitchen/default.nix

@@ -1,9 +1,9 @@
-{ python3Packages, fetchurl, lib, ... }:
+{ python3Packages, fetchurl, ... }:
 python3Packages.buildPythonPackage rec {
   pname = "comfy-kitchen";
   version = "0.2.7";
   format = "wheel";
-# https://files.pythonhosted.org/packages/f8/65/d483613734d0b9753bd9bfa297ff334cb2c7766e82306099db6b259b4e2c/comfy_kitchen-0.2.7-py3-none-any.whl
+  # https://files.pythonhosted.org/packages/f8/65/d483613734d0b9753bd9bfa297ff334cb2c7766e82306099db6b259b4e2c/comfy_kitchen-0.2.7-py3-none-any.whl
   src = fetchurl {
     url = "https://files.pythonhosted.org/packages/f8/65/d483613734d0b9753bd9bfa297ff334cb2c7766e82306099db6b259b4e2c/comfy_kitchen-0.2.7-py3-none-any.whl";
     sha256 = "sha256-+PqlebadMx0vHqwJ6WqVWGwqa5WKVLwZ5/HBp3hS3TY=";

systems/x86_64-linux/jallen-nas/default.nix

@@ -6,15 +6,7 @@
   ...
 }:
 let
-  inherit (lib.${namespace}) enabled disabled mkContainer;
+  inherit (lib.${namespace}) enabled disabled;
-
-  testcontainer = mkContainer {
-    name = "testContainer";
-    localAddress = "10.1.1.3";
-    ports = [ 80 ];
-    bindMounts = { };
-    config = { };
-  };
 in
 {
   imports = [

systems/x86_64-linux/jallen-nas/services.nix

@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   ...
 }:

systems/x86_64-linux/jallen-nas/vpn.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 # let