From a9b26c819871b69d9ff5da0955bd4e3dddd2e778 Mon Sep 17 00:00:00 2001
From: SebastianStork <git@sstork.dev>
Date: Sat, 7 Feb 2026 22:28:48 +0100
Subject: [PATCH] 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}";
+      };
     };
   };
 }