From 6b28f57207e3ed0436f0208c6b11b5a5f5cda947 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Mon, 7 Jul 2025 11:27:09 -0500 Subject: [PATCH] add nas settings file --- flake.lock | 80 +++++++++++++-------------- hosts/nas/apps/actual/default.nix | 2 +- hosts/nas/apps/arrs/default.nix | 2 +- hosts/nas/apps/gitea/default.nix | 2 +- hosts/nas/apps/immich/default.nix | 2 +- hosts/nas/apps/jellyseerr/default.nix | 2 +- hosts/nas/apps/nextcloud/default.nix | 4 +- hosts/nas/apps/paperless/default.nix | 2 +- hosts/nas/apps/traefik/default.nix | 2 +- hosts/nas/networking.nix | 2 +- hosts/nas/settings.nix | 5 ++ 11 files changed, 55 insertions(+), 50 deletions(-) create mode 100644 hosts/nas/settings.nix diff --git a/flake.lock b/flake.lock index bb0291b..29eb323 100755 --- a/flake.lock +++ b/flake.lock @@ -19,16 +19,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1749043670, - "narHash": "sha256-gwHngqb23U8By7jhxFWQZOXy+vPQApJSkvr4gHI5ifQ=", + "lastModified": 1751031262, + "narHash": "sha256-SNgRMQUjL3DTlWkMyRMan+pY1FfIV+DMeq5BiTM0N0k=", "owner": "goauthentik", "repo": "authentik", - "rev": "bda30c5ad5838fea36dc0a06f8580cca437f0fc0", + "rev": "b34665fabd8d938d81ce871a4e86ca528c5f253b", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2025.4.2", + "ref": "version/2025.4.3", "repo": "authentik", "type": "github" } @@ -413,11 +413,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -854,11 +854,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1749129962, - "narHash": "sha256-gc1l5z5dWw9a9DWsrp0ZiD+SSMsNpEwMEiRi8K5sh5c=", + "lastModified": 1751033152, + "narHash": "sha256-0ANu9OLQJszcEyvnfDB7G957uqskZwCrTzRXz/yfAmE=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "271a38f7c4e2551f0674b894e2adf7cd1ddb8168", + "rev": "1a4d6a5dd6fef39b99eb7ea4db79c5d5c7d7f1bf", "type": "github" }, "original": { @@ -877,11 +877,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1750590485, - "narHash": "sha256-0j3ZhM2G0QEpgnJwFTk8A0EwppMispfT7hME84c2jyg=", + "lastModified": 1751591814, + "narHash": "sha256-A4lgvuj4v+Pr8MniXz1FBG0DXOygi8tTECR+j53FMhM=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "7f49ed84253338f47e4187aa0e7480baa5c784f9", + "rev": "fef2d0c78c4e4d6c600a88795af193131ff51bdc", "type": "github" }, "original": { @@ -918,11 +918,11 @@ ] }, "locked": { - "lastModified": 1750728643, - "narHash": "sha256-UfkzoBlXF2Q0PIXxyGqPhUlQBvOIL3mQXFoyXd4EYqg=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "c9d8158bc56923013fa9a4346ba3e273f3b956b3", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -1012,11 +1012,11 @@ }, "nas-nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -1028,11 +1028,11 @@ }, "nas-nixpkgs": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ ] }, "locked": { - "lastModified": 1750119275, - "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", + "lastModified": 1751606940, + "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", + "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "type": "github" }, "original": { @@ -1277,11 +1277,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1750330365, - "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", + "lastModified": 1751048012, + "narHash": "sha256-MYbotu4UjWpTsq01wglhN5xDRfZYLFtNk7SBY0BcjkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", + "rev": "a684c58d46ebbede49f280b653b9e56100aa3877", "type": "github" }, "original": { @@ -1787,11 +1787,11 @@ ] }, "locked": { - "lastModified": 1748562898, - "narHash": "sha256-STk4QklrGpM3gliPKNJdBLSQvIrqRuwHI/rnYb/5rh8=", + "lastModified": 1749519371, + "narHash": "sha256-UJONN7mA2stweZCoRcry2aa1XTTBL0AfUOY84Lmqhos=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "33bd58351957bb52dd1700ea7eeefe34de06a892", + "rev": "7c06967eca687f3482624250428cc12f43c92523", "type": "github" }, "original": { @@ -1808,11 +1808,11 @@ ] }, "locked": { - "lastModified": 1746540146, - "narHash": "sha256-QxdHGNpbicIrw5t6U3x+ZxeY/7IEJ6lYbvsjXmcxFIM=", + "lastModified": 1750499893, + "narHash": "sha256-ThKBd8XSvITAh2JqU7enOp8AfKeQgf9u7zYC41cnBE4=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "e09c10c24ebb955125fda449939bfba664c467fd", + "rev": "e824458bd917b44bf4c38795dea2650336b2f55d", "type": "github" }, "original": { @@ -1949,11 +1949,11 @@ ] }, "locked": { - "lastModified": 1750560265, - "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", + "lastModified": 1751251399, + "narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", + "rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b", "type": "github" }, "original": { @@ -2319,11 +2319,11 @@ ] }, "locked": { - "lastModified": 1748916602, - "narHash": "sha256-GiwjjmPIISDFD0uQ1DqQ+/38hZ+2z1lTKVj/TkKaWwQ=", + "lastModified": 1750987094, + "narHash": "sha256-GujDElxLgYatnNvuL1U6qd18lcuG6anJMjpfYRScV08=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "a4dd471de62b27928191908f57bfcd702ec2bfc9", + "rev": "4b703d851b61e664a70238711a8ff0efa1aa2f52", "type": "github" }, "original": { diff --git a/hosts/nas/apps/actual/default.nix b/hosts/nas/apps/actual/default.nix index 29bb78a..2bf6a01 100644 --- a/hosts/nas/apps/actual/default.nix +++ b/hosts/nas/apps/actual/default.nix @@ -2,7 +2,7 @@ with lib; let cfg = config.nas-apps.actual; - settings = import ../settings.nix; + settings = import ../../settings.nix; dataDir = "/data"; hostAddress = settings.hostAddress; actualUserId = config.users.users.nix-apps.uid; diff --git a/hosts/nas/apps/arrs/default.nix b/hosts/nas/apps/arrs/default.nix index aeaf53f..c825add 100755 --- a/hosts/nas/apps/arrs/default.nix +++ b/hosts/nas/apps/arrs/default.nix @@ -7,7 +7,7 @@ with lib; let cfg = config.nas-apps.arrs; - settings = import ../settings.nix; + settings = import ../../settings.nix; radarrDataDir = "/var/lib/radarr"; downloadDir = "/downloads"; incompleteDir = "/downloads-incomplete"; diff --git a/hosts/nas/apps/gitea/default.nix b/hosts/nas/apps/gitea/default.nix index bd0b290..a537d63 100644 --- a/hosts/nas/apps/gitea/default.nix +++ b/hosts/nas/apps/gitea/default.nix @@ -2,7 +2,7 @@ with lib; let cfg = config.nas-apps.gitea; - settings = import ../settings.nix; + settings = import ../../settings.nix; hostAddress = settings.hostAddress; # localAddress = "10.0.4.18"; # httpPort = 3000; diff --git a/hosts/nas/apps/immich/default.nix b/hosts/nas/apps/immich/default.nix index 05808eb..b33f20c 100755 --- a/hosts/nas/apps/immich/default.nix +++ b/hosts/nas/apps/immich/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: let - settings = import ../settings.nix; + settings = import ../../settings.nix; immichPort = 2283; dataDir = "/media/nas/main/photos"; dbPassword = config.sops.secrets."jallen-nas/immich/db-password".path; diff --git a/hosts/nas/apps/jellyseerr/default.nix b/hosts/nas/apps/jellyseerr/default.nix index 49f40de..7188537 100755 --- a/hosts/nas/apps/jellyseerr/default.nix +++ b/hosts/nas/apps/jellyseerr/default.nix @@ -3,7 +3,7 @@ let jellyseerrPort = 5055; dataDir = "/var/lib/private/jellyseerr"; - settings = import ../settings.nix; + settings = import ../../settings.nix; in { containers.jellyseerr = { diff --git a/hosts/nas/apps/nextcloud/default.nix b/hosts/nas/apps/nextcloud/default.nix index 8e73604..0746a0b 100755 --- a/hosts/nas/apps/nextcloud/default.nix +++ b/hosts/nas/apps/nextcloud/default.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: let - settings = import ../settings.nix; + settings = import ../../settings.nix; adminpass = config.sops.secrets."jallen-nas/nextcloud/adminpassword".path; secretsFile = config.sops.secrets."jallen-nas/nextcloud/smtp_settings".path; jwtSecretFile = config.sops.secrets."jallen-nas/onlyoffice-key".path; @@ -55,7 +55,7 @@ in config = { pkgs, lib, ... }: { - imports = [ ../../../../share/nvidia ]; + imports = [ ../../../../modules/nvidia ]; nixpkgs.config.allowUnfree = true; networking.extraHosts = '' ${hostAddress} host.containers protonmail-bridge diff --git a/hosts/nas/apps/paperless/default.nix b/hosts/nas/apps/paperless/default.nix index 8905009..b97ef06 100755 --- a/hosts/nas/apps/paperless/default.nix +++ b/hosts/nas/apps/paperless/default.nix @@ -4,7 +4,7 @@ ... }: let - settings = import ../settings.nix; + settings = import ../../settings.nix; paperlessPort = 28981; paperlessUserId = config.users.users.nix-apps.uid; paperlessGroupId = config.users.groups.jallen-nas.gid; diff --git a/hosts/nas/apps/traefik/default.nix b/hosts/nas/apps/traefik/default.nix index b59101a..9f9b464 100755 --- a/hosts/nas/apps/traefik/default.nix +++ b/hosts/nas/apps/traefik/default.nix @@ -1,6 +1,6 @@ { config, ... }: let - settings = import ../settings.nix; + settings = import ../../settings.nix; domain = "mjallen.dev"; serverIp = settings.hostAddress; diff --git a/hosts/nas/networking.nix b/hosts/nas/networking.nix index 15820dd..90a9514 100755 --- a/hosts/nas/networking.nix +++ b/hosts/nas/networking.nix @@ -27,7 +27,7 @@ in { # Networking configs networking = { - hostName = settings.hostname; + hostName = settings.hostName; useNetworkd = true; diff --git a/hosts/nas/settings.nix b/hosts/nas/settings.nix new file mode 100644 index 0000000..c626004 --- /dev/null +++ b/hosts/nas/settings.nix @@ -0,0 +1,5 @@ +{ + username = "admin"; + hostAddress = "10.0.1.3"; + hostName = "jallen-nas"; +} \ No newline at end of file