diff --git a/flake.lock b/flake.lock index 665c5c9..3625521 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1770328441, - "narHash": "sha256-v3rNKKUg+pWInBlJVYBMxLbImpdwLlKnjJ8rPp6IR8I=", + "lastModified": 1769758502, + "narHash": "sha256-jFT7y3qJdngk4yfS4FM3TC+MBhob/wEVkb/vEh3eF40=", "owner": "nlewo", "repo": "comin", - "rev": "a651f36e6a211be6d3f51ffffe9cb2bd9a4a3cef", + "rev": "69ee06dc03cdd50e72a71634d7840af01afc6114", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1770437015, - "narHash": "sha256-+FHN9EthS+kHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA=", + "lastModified": 1770091431, + "narHash": "sha256-9Sqq/hxq8ZDLRSzu+edn0OfWG+FAPWFpwMKaJobeLec=", "owner": "rycee", "repo": "nur-expressions", - "rev": "65d59f814068d04e532cad2773d281e4951acd95", + "rev": "4f827ff035c6ddc58d04c45abe5b777d356b926a", "type": "gitlab" }, "original": { @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1770260404, - "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", + "lastModified": 1769580047, + "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", + "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", "type": "github" }, "original": { @@ -278,11 +278,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770464364, - "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "lastModified": 1770136044, + "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", + "lastModified": 1769691507, + "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", + "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1770431965, - "narHash": "sha256-vVMfSjrmeYGfT+dj5eLZ8xNnJP62gvdW32IFQk606wM=", + "lastModified": 1770086828, + "narHash": "sha256-mufcsiTsh04F5pocBQcdKWjIah0YwFGtM57UXXmiBm4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2b53743c0c65c6c525952fce502fe6eaa0913300", + "rev": "4badc6c89256856f3537d05e14dce64674f39382", "type": "github" }, "original": { diff --git a/hosts/vps-private/default.nix b/hosts/vps-private/default.nix index 2dd1244..455b7bd 100644 --- a/hosts/vps-private/default.nix +++ b/hosts/vps-private/default.nix @@ -26,18 +26,12 @@ services = { dns.enable = true; - syncthing = { enable = true; isServer = true; gui.domain = "syncthing.${privateDomain}"; doBackups = true; }; - - atuin = { - enable = true; - domain = "atuin.${privateDomain}"; - }; }; web-services = { @@ -52,6 +46,11 @@ domain = "budget.${privateDomain}"; doBackups = true; }; + + atuin = { + enable = true; + domain = "atuin.${privateDomain}"; + }; }; }; } diff --git a/modules/system/services/alloy.nix b/modules/system/web-services/alloy.nix similarity index 98% rename from modules/system/services/alloy.nix rename to modules/system/web-services/alloy.nix index 4cc71d2..45f643e 100644 --- a/modules/system/services/alloy.nix +++ b/modules/system/web-services/alloy.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - cfg = config.custom.services.alloy; + cfg = config.custom.web-services.alloy; in { - options.custom.services.alloy = { + options.custom.web-services.alloy = { enable = lib.mkEnableOption ""; domain = lib.mkOption { type = lib.types.nonEmptyStr; diff --git a/modules/system/services/atuin.nix b/modules/system/web-services/atuin.nix similarity index 85% rename from modules/system/services/atuin.nix rename to modules/system/web-services/atuin.nix index 931fb42..d660014 100644 --- a/modules/system/services/atuin.nix +++ b/modules/system/web-services/atuin.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - cfg = config.custom.services.atuin; + cfg = config.custom.web-services.atuin; in { - options.custom.services.atuin = { + options.custom.web-services.atuin = { enable = lib.mkEnableOption ""; domain = lib.mkOption { type = lib.types.nonEmptyStr; diff --git a/profiles/server.nix b/profiles/server.nix index 284eeae..48574a0 100644 --- a/profiles/server.nix +++ b/profiles/server.nix @@ -8,10 +8,10 @@ services = { auto-gc.onlyCleanRoots = true; comin.enable = true; - alloy = { - enable = true; - domain = "alloy.${config.networking.hostName}.${config.custom.networking.overlay.domain}"; - }; + }; + web-services.alloy = { + enable = true; + domain = "alloy.${config.networking.hostName}.${config.custom.networking.overlay.domain}"; }; }; }