From a9c1d71495251cf4534ca21766548cb5576efda1 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Wed, 4 Feb 2026 20:40:34 -0600 Subject: [PATCH] fmt --- lib/module/default.nix | 5 +- .../services/homeassistant/default.nix | 2 + modules/nixos/services/caddy/default.nix | 2 +- modules/nixos/services/traefik/default.nix | 108 ++---------------- packages/comfyui/.asddefault.nix | 76 ++++++------ packages/comfyui/comfyui-desktop/default.nix | 21 ++-- packages/comfyui/comfyui-frontend/default.nix | 21 ++-- packages/comfyui/comfyui/default.nix | 12 +- packages/python/comfy-aimdo/default.nix | 4 +- packages/python/comfy-kitchen/default.nix | 4 +- secrets/secrets.yaml | 4 +- systems/x86_64-linux/jallen-nas/default.nix | 10 +- systems/x86_64-linux/jallen-nas/services.nix | 2 - systems/x86_64-linux/jallen-nas/vpn.nix | 5 +- 14 files changed, 84 insertions(+), 192 deletions(-) diff --git a/lib/module/default.nix b/lib/module/default.nix index 0691502..f82f2ad 100644 --- 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 diff --git a/modules/nixos/homeassistant/services/homeassistant/default.nix b/modules/nixos/homeassistant/services/homeassistant/default.nix index 47fdd63..8a86f64 100644 --- 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 = { diff --git a/modules/nixos/services/caddy/default.nix b/modules/nixos/services/caddy/default.nix index 3dd4cd7..3aa700f 100644 --- a/modules/nixos/services/caddy/default.nix +++ b/modules/nixos/services/caddy/default.nix @@ -85,7 +85,7 @@ let services.caddy = { enable = true; package = caddyPackage; - environmentFile = config.sops.templates."caddy.env".path; + environmentFile = config.sops.templates."caddy.env".path; email = "jalle008@proton.me"; enableReload = false; dataDir = "${cfg.configDir}/caddy"; diff --git a/modules/nixos/services/traefik/default.nix b/modules/nixos/services/traefik/default.nix index 76d0501..6e2fbc7 100755 --- 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 :8080 of your server - api.insecure = true; + # Access the Traefik dashboard on :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 = { @@ -405,7 +312,7 @@ in priority = 10; tls.certResolver = "letsencrypt"; }; - + hass = { entryPoints = [ "websecure" ]; rule = "Host(`hass.${domain}`)"; @@ -413,13 +320,12 @@ in middlewares = [ "crowdsec" "whitelist-geoblock" - "authentik" + # "authentik" ]; priority = 10; tls.certResolver = "letsencrypt"; }; } - // extraRouterConfigs // reverseProxyRouterConfigs; }; }; diff --git a/packages/comfyui/.asddefault.nix b/packages/comfyui/.asddefault.nix index 52e0292..6a78ff7 100644 --- a/packages/comfyui/.asddefault.nix +++ b/packages/comfyui/.asddefault.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, ... @@ -26,56 +25,53 @@ python3Packages.buildPythonPackage rec { # ]; build-system = with python3Packages; [ - + ]; - dependencies = - with python3Packages; - [ - aiohttp - torch - torchaudio - torchvision - numpy - requests + dependencies = with python3Packages; [ + aiohttp + torch + torchaudio + torchvision + numpy + requests - torchsde - einops - transformers - tokenizers - sentencepiece - safetensors - aiohttp - yarl - pyyaml - pillow - scipy - tqdm - psutil - alembic - sqlalchemy - av - requests + torchsde + einops + transformers + tokenizers + sentencepiece + safetensors + aiohttp + yarl + pyyaml + pillow + scipy + tqdm + psutil + alembic + sqlalchemy + av + requests - #non essential dependencies: - kornia - # spandrel - pydantic - pydantic-settings - ]; + #non essential dependencies: + kornia + # spandrel + pydantic + pydantic-settings + ]; nativeCheckInputs = with python3Packages; [ - + ]; setupPhase = null; # comfyui-frontend-package==1.37.11 - # comfyui-workflow-templates==0.8.31 - # comfyui-embedded-docs==0.4.0 - # comfy-kitchen - # comfy-aimdo - + # comfyui-workflow-templates==0.8.31 + # comfyui-embedded-docs==0.4.0 + # comfy-kitchen + # comfy-aimdo # pythonImportsCheck = [ "roborock" ]; diff --git a/packages/comfyui/comfyui-desktop/default.nix b/packages/comfyui/comfyui-desktop/default.nix index 2194fdc..b89b690 100644 --- a/packages/comfyui/comfyui-desktop/default.nix +++ b/packages/comfyui/comfyui-desktop/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - python3Packages, fetchFromGitHub, ... }: @@ -26,19 +25,19 @@ stdenv.mkDerivation rec { mkdir -p $out cp -r $src $out ''; - # ln -s ${comfyUiLauncher}/bin/comfy-ui $out/bin/comfy-ui - # ln -s $out/bin/comfy-ui $out/bin/comfyui + # ln -s ${comfyUiLauncher}/bin/comfy-ui $out/bin/comfy-ui + # ln -s $out/bin/comfy-ui $out/bin/comfyui passthru = { inherit - # comfyuiSrc - # pythonRuntime - # modelDownloaderDir - # frontendRoot - # dependencies - version + # comfyuiSrc + # pythonRuntime + # modelDownloaderDir + # frontendRoot + # dependencies + version ; - + }; meta = with lib; { @@ -55,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "comfy-ui"; }; -} \ No newline at end of file +} diff --git a/packages/comfyui/comfyui-frontend/default.nix b/packages/comfyui/comfyui-frontend/default.nix index 231a4b6..7eb9f46 100644 --- a/packages/comfyui/comfyui-frontend/default.nix +++ b/packages/comfyui/comfyui-frontend/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - python3Packages, fetchFromGitHub, ... }: @@ -26,19 +25,19 @@ stdenv.mkDerivation rec { mkdir -p $out cp -r $src $out ''; - # ln -s ${comfyUiLauncher}/bin/comfy-ui $out/bin/comfy-ui - # ln -s $out/bin/comfy-ui $out/bin/comfyui + # ln -s ${comfyUiLauncher}/bin/comfy-ui $out/bin/comfy-ui + # ln -s $out/bin/comfy-ui $out/bin/comfyui passthru = { inherit - # comfyuiSrc - # pythonRuntime - # modelDownloaderDir - # frontendRoot - # dependencies - version + # comfyuiSrc + # pythonRuntime + # modelDownloaderDir + # frontendRoot + # dependencies + version ; - + }; meta = with lib; { @@ -55,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "comfy-ui"; }; -} \ No newline at end of file +} diff --git a/packages/comfyui/comfyui/default.nix b/packages/comfyui/comfyui/default.nix index 0fcfa17..f685557 100644 --- 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"; @@ -72,8 +70,8 @@ stdenv.mkDerivation rec { ln -sf ${pythonEnv}/bin/python $out/bin/python cp -r $src/* $out/app ''; - # ln -s ${comfyUiLauncher}/bin/comfy-ui $out/bin/comfy-ui - # ln -s $out/bin/comfy-ui $out/bin/comfyui + # ln -s ${comfyUiLauncher}/bin/comfy-ui $out/bin/comfy-ui + # ln -s $out/bin/comfy-ui $out/bin/comfyui # passthru = { # inherit @@ -84,7 +82,7 @@ stdenv.mkDerivation rec { # dependencies # version # ; - + # }; meta = with lib; { @@ -106,4 +104,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "comfy-ui"; }; -} \ No newline at end of file +} diff --git a/packages/python/comfy-aimdo/default.nix b/packages/python/comfy-aimdo/default.nix index 1e19414..de0ae4b 100644 --- a/packages/python/comfy-aimdo/default.nix +++ b/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"; diff --git a/packages/python/comfy-kitchen/default.nix b/packages/python/comfy-kitchen/default.nix index 3ffe418..4dd9729 100644 --- a/packages/python/comfy-kitchen/default.nix +++ b/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="; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 0dc64f4..92ce85d 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -5,8 +5,8 @@ admin_password: ENC[AES256_GCM,data:aGyn1Tm+2ld3BqXN3U1RQkew13Ln0Y3+xYiIUjErmq8Y github-token: ENC[AES256_GCM,data:FAuwS/j5kd/NvOVdwa+ROWgMZCjyOjDbIMoU11KkaUOVhnztZyLGCA==,iv:+EvAvf7cUpljLHaxVkBRloZsAYcKjceJHinUU47PCRI=,tag:p0irO6vnt5nr4sZIq9B8gA==,type:str] disk-key: ENC[AES256_GCM,data:cJdjG1gWYT4V0idae0nZl0j9FoEQuMW5PhQer2s8t4piv2mE8XM64W92MJyhi2aNtZ3cJ9h5PSW49zLeUWXIPGJNAvwRyWVc0O+T96jlZqtFlYBYLVh4tXdpXmxvq7IhB+sR2rY7qpcJEtCyUR8Mc7uzPZLQhuicwOjYuThhMdq73v3Re4taiL358U4DsLGhaQaGVoZ/RVRqT40F0ByxZto+JbwFGJBjQJlBhxE0b5pge93hQJcyY0LiI0Ctkv43gR5pnkHpXlM5TqZvzJLQVkG+N9IaRg0fPBnTyR8IaTi6ZAqBTY9byMPbfRsMgwY/FdGCkBguLNBt8a8P4TzzKo8CwcBcSOcCMKh+tzBwIAOxFb3H6lgLiKutA5wxgOrJ1tADvPxjEOjPx3zXVZA1jzsqtH4p6s5XDKJVhSoT08gI6DN7ILhBG9v8+NDeBj8ENFkMxDnbFrEyBt2j1fwq5s2/SmioN407KVi8Jd7SqQBEcp2WHFkrc95nJTyDer0J34jVUPVtVaqmLAPlzKWr9VZyrDJbl4stwz/pjstxtDfx4urxNYn6fhs3vigU6JFrE3sVN4MMosgvDxyqiMM44Qc6V6XO1GDJxKUo9kP8CGNvLpsMZSY9ZSjQaxMUNqXfySCry3AsOZolo6XUtbEk3YGGVAiJoiUE9aogdh++zRVYi+s2pzwf8BYGK2OB+C8ojSTRtcjsTCacWlV4cCnkpC5hpQ7KBycg8hYEm3bTjMuKcqsSTl8TUgwk4gq2cq2ZqvTWE7AHcgLGiFcT4/vm05rdS8j+nq5XprBUAwcvhR+wHtgU/HcJr939hp/45ZVI5a2DtcbhFOnrX+W/TZsUHdw+pxzau4JUfMI5COc3ntD0IOwP8c/dH+DOYeI6KToV8judUnIyMKnJrXBRpGoLa9kmbslUpw2oZSnQo1jBB1rQqLiQmbjA3nybAunmgrnaMtZcZZBX,iv:Y2rQMzIP4iA4YTRReMhIaG6aKTnlQjBl/eVdxg9gipM=,tag:m9KlqWLIxQ5065DBB8u0rw==,type:str] protonvpn: - username: ENC[AES256_GCM,data:8jTLeHnmKzWIk7G2Q9m1kQ==,iv:FYuHAN3s/0DL/N3uQMeMCOW+SRmN9Mhx7ygMcWqBjMc=,tag:NXPYwxuSJxMm5rAE0mAgJg==,type:str] - password: ENC[AES256_GCM,data:doniXa2cguAyhhCS+VX/w2BgIUYAaNgbj1mNP2HlvHU=,iv:ds9jHnzvwXTWdCZbkRMrNpVN7kdIvNDtuyRUyf59sgw=,tag:tlGG4ixZkPofq0CjExOuTQ==,type:str] + username: ENC[AES256_GCM,data:8jTLeHnmKzWIk7G2Q9m1kQ==,iv:FYuHAN3s/0DL/N3uQMeMCOW+SRmN9Mhx7ygMcWqBjMc=,tag:NXPYwxuSJxMm5rAE0mAgJg==,type:str] + password: ENC[AES256_GCM,data:doniXa2cguAyhhCS+VX/w2BgIUYAaNgbj1mNP2HlvHU=,iv:ds9jHnzvwXTWdCZbkRMrNpVN7kdIvNDtuyRUyf59sgw=,tag:tlGG4ixZkPofq0CjExOuTQ==,type:str] age-keys-private: matt-desktop-nix: ENC[AES256_GCM,data:7/UO2Oq096iJHSpwA2cflRoiPWrKFJA2RhcuH0bJKM/MO15GbW1VktPZieEVrj+3KTYnhrWr5mEHx+uekhyL2W98SO0JkIJ/c24=,iv:w9lt2rQzkys2HSR8ls4RKJlkNsAb61a+6eB/joKDEtQ=,tag:OYkFVP9HGHumE/3PUP64PA==,type:str] admin-jallen-nas: ENC[AES256_GCM,data:lKXCpyB0+wViUYsJgxxe7a4dD24a80xe1XEfvVLoazEb/qmoUClhXU4FI1o8ATvpND4XG/vlq8IsZ3V3Yr2FQSOQTrUxs+Yz1po=,iv:Po0jpfoHNMu4s6EePwD20Kc0HQhnY+YKnwovkqCzviI=,tag:0YHI6cNWV21OH2gMOX/Gmw==,type:str] diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index 7bc2d3a..ea5e8a1 100755 --- 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 = [ diff --git a/systems/x86_64-linux/jallen-nas/services.nix b/systems/x86_64-linux/jallen-nas/services.nix index b886c0a..697b614 100755 --- 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, ... }: diff --git a/systems/x86_64-linux/jallen-nas/vpn.nix b/systems/x86_64-linux/jallen-nas/vpn.nix index 3b62632..5beabab 100644 --- 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 @@ -45,7 +44,7 @@ # }; # systemd.services = { - # vpn-netns = + # vpn-netns = # let # ip = "${pkgs.iproute2}/bin/ip"; # in { @@ -291,4 +290,4 @@ }; }; }; -} \ No newline at end of file +}