From a9b26c819871b69d9ff5da0955bd4e3dddd2e778 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sat, 7 Feb 2026 22:28:48 +0100 Subject: [PATCH 1/2] Move modules `alloy` and `atuin` from `web-services` to `services` --- hosts/vps-private/default.nix | 11 ++++++----- modules/system/{web-services => services}/alloy.nix | 4 ++-- modules/system/{web-services => services}/atuin.nix | 4 ++-- profiles/server.nix | 8 ++++---- 4 files changed, 14 insertions(+), 13 deletions(-) rename modules/system/{web-services => services}/alloy.nix (98%) rename modules/system/{web-services => services}/atuin.nix (85%) diff --git a/hosts/vps-private/default.nix b/hosts/vps-private/default.nix index 455b7bd..2dd1244 100644 --- a/hosts/vps-private/default.nix +++ b/hosts/vps-private/default.nix @@ -26,12 +26,18 @@ services = { dns.enable = true; + syncthing = { enable = true; isServer = true; gui.domain = "syncthing.${privateDomain}"; doBackups = true; }; + + atuin = { + enable = true; + domain = "atuin.${privateDomain}"; + }; }; web-services = { @@ -46,11 +52,6 @@ domain = "budget.${privateDomain}"; doBackups = true; }; - - atuin = { - enable = true; - domain = "atuin.${privateDomain}"; - }; }; }; } diff --git a/modules/system/web-services/alloy.nix b/modules/system/services/alloy.nix similarity index 98% rename from modules/system/web-services/alloy.nix rename to modules/system/services/alloy.nix index 45f643e..4cc71d2 100644 --- a/modules/system/web-services/alloy.nix +++ b/modules/system/services/alloy.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - cfg = config.custom.web-services.alloy; + cfg = config.custom.services.alloy; in { - options.custom.web-services.alloy = { + options.custom.services.alloy = { enable = lib.mkEnableOption ""; domain = lib.mkOption { type = lib.types.nonEmptyStr; diff --git a/modules/system/web-services/atuin.nix b/modules/system/services/atuin.nix similarity index 85% rename from modules/system/web-services/atuin.nix rename to modules/system/services/atuin.nix index d660014..931fb42 100644 --- a/modules/system/web-services/atuin.nix +++ b/modules/system/services/atuin.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - cfg = config.custom.web-services.atuin; + cfg = config.custom.services.atuin; in { - options.custom.web-services.atuin = { + options.custom.services.atuin = { enable = lib.mkEnableOption ""; domain = lib.mkOption { type = lib.types.nonEmptyStr; diff --git a/profiles/server.nix b/profiles/server.nix index 48574a0..284eeae 100644 --- a/profiles/server.nix +++ b/profiles/server.nix @@ -8,10 +8,10 @@ services = { auto-gc.onlyCleanRoots = true; comin.enable = true; - }; - web-services.alloy = { - enable = true; - domain = "alloy.${config.networking.hostName}.${config.custom.networking.overlay.domain}"; + alloy = { + enable = true; + domain = "alloy.${config.networking.hostName}.${config.custom.networking.overlay.domain}"; + }; }; }; } From 8c42b5ea1ac588d419509bc901f771bfa8975097 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sat, 7 Feb 2026 22:29:55 +0100 Subject: [PATCH 2/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'comin': 'github:nlewo/comin/69ee06dc03cdd50e72a71634d7840af01afc6114?narHash=sha256-jFT7y3qJdngk4yfS4FM3TC%2BMBhob/wEVkb/vEh3eF40%3D' (2026-01-30) → 'github:nlewo/comin/a651f36e6a211be6d3f51ffffe9cb2bd9a4a3cef?narHash=sha256-v3rNKKUg%2BpWInBlJVYBMxLbImpdwLlKnjJ8rPp6IR8I%3D' (2026-02-05) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/4f827ff035c6ddc58d04c45abe5b777d356b926a?dir=pkgs/firefox-addons&narHash=sha256-9Sqq/hxq8ZDLRSzu%2Bedn0OfWG%2BFAPWFpwMKaJobeLec%3D' (2026-02-03) → 'gitlab:rycee/nur-expressions/65d59f814068d04e532cad2773d281e4951acd95?dir=pkgs/firefox-addons&narHash=sha256-%2BFHN9EthS%2BkHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA%3D' (2026-02-07) • Updated input 'home-manager': 'github:nix-community/home-manager/366d78c2856de6ab3411c15c1cb4fb4c2bf5c826?narHash=sha256-tNqCP/%2B2%2BpeAXXQ2V8RwsBkenlfWMERb%2BUy6xmevyhM%3D' (2026-01-28) → 'github:nix-community/home-manager/0d782ee42c86b196acff08acfbf41bb7d13eed5b?narHash=sha256-3iVX1%2B7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8%3D' (2026-02-05) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/e576e3c9cf9bad747afcddd9e34f51d18c855b4e?narHash=sha256-tlFqNG/uzz2%2B%2BaAmn4v8J0vAkV3z7XngeIIB3rM3650%3D' (2026-02-03) → 'github:nixos/nixpkgs/23d72dabcb3b12469f57b37170fcbc1789bd7457?narHash=sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY%3D' (2026-02-07) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/e6eae2ee2110f3d31110d5c222cd395303343b08?narHash=sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc%3D' (2026-02-03) → 'github:nixos/nixpkgs/00c21e4c93d963c50d4c0c89bfa84ed6e0694df2?narHash=sha256-AYqlWrX09%2BHvGs8zM6ebZ1pwUqjkfpnv8mewYwAo%2BiM%3D' (2026-02-04) • Updated input 'treefmt': 'github:numtide/treefmt-nix/28b19c5844cc6e2257801d43f2772a4b4c050a1b?narHash=sha256-8aAYwyVzSSwIhP2glDhw/G0i5%2BwOrren3v6WmxkVonM%3D' (2026-01-29) → 'github:numtide/treefmt-nix/337a4fe074be1042a35086f15481d763b8ddc0e7?narHash=sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD%2BFyxk%3D' (2026-02-04) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/4badc6c89256856f3537d05e14dce64674f39382?narHash=sha256-mufcsiTsh04F5pocBQcdKWjIah0YwFGtM57UXXmiBm4%3D' (2026-02-03) → 'github:nix-community/nix-vscode-extensions/2b53743c0c65c6c525952fce502fe6eaa0913300?narHash=sha256-vVMfSjrmeYGfT%2Bdj5eLZ8xNnJP62gvdW32IFQk606wM%3D' (2026-02-07) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 3625521..665c5c9 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1769758502, - "narHash": "sha256-jFT7y3qJdngk4yfS4FM3TC+MBhob/wEVkb/vEh3eF40=", + "lastModified": 1770328441, + "narHash": "sha256-v3rNKKUg+pWInBlJVYBMxLbImpdwLlKnjJ8rPp6IR8I=", "owner": "nlewo", "repo": "comin", - "rev": "69ee06dc03cdd50e72a71634d7840af01afc6114", + "rev": "a651f36e6a211be6d3f51ffffe9cb2bd9a4a3cef", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1770091431, - "narHash": "sha256-9Sqq/hxq8ZDLRSzu+edn0OfWG+FAPWFpwMKaJobeLec=", + "lastModified": 1770437015, + "narHash": "sha256-+FHN9EthS+kHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4f827ff035c6ddc58d04c45abe5b777d356b926a", + "rev": "65d59f814068d04e532cad2773d281e4951acd95", "type": "gitlab" }, "original": { @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1769580047, - "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -278,11 +278,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770136044, - "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1769691507, - "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1770086828, - "narHash": "sha256-mufcsiTsh04F5pocBQcdKWjIah0YwFGtM57UXXmiBm4=", + "lastModified": 1770431965, + "narHash": "sha256-vVMfSjrmeYGfT+dj5eLZ8xNnJP62gvdW32IFQk606wM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4badc6c89256856f3537d05e14dce64674f39382", + "rev": "2b53743c0c65c6c525952fce502fe6eaa0913300", "type": "github" }, "original": {