From 0bc9abc4c0e6152cef0f3b8597875884e54599d4 Mon Sep 17 00:00:00 2001
From: wo2wz <189177184+wo2wz@users.noreply.github.com>
Date: Sat, 4 Oct 2025 18:32:46 -0400
Subject: [PATCH] common: move to modules, move some files out, modules: adjust
 dir structure

---
 common/default.nix                            | 22 --------------
 common/networking.nix                         |  8 -----
 common/ssh/default.nix                        |  8 -----
 hosts/Drone/default.nix                       | 29 +++++++------------
 hosts/Earthmover/default.nix                  |  4 +--
 hosts/Mindflayer/default.nix                  |  6 ++--
 hosts/Swordsmachine/default.nix               | 11 +++----
 {common => modules/common}/boot.nix           |  9 +-----
 modules/common/default-packages.nix           |  5 ++++
 modules/common/default.nix                    | 10 +++++--
 {common => modules/common}/locales.nix        |  0
 modules/common/networking.nix                 |  5 ++++
 {common => modules/common}/nix.nix            |  0
 {common => modules/common}/users.nix          |  0
 modules/nixos/default.nix                     |  8 ++---
 modules/nixos/{ => programs}/bash.nix         |  0
 modules/nixos/programs/default.nix            | 11 +++++++
 modules/nixos/{ => programs}/gaming.nix       |  0
 modules/nixos/{ => programs}/git.nix          |  0
 modules/nixos/{ => programs}/kde.nix          |  0
 .../default.nix => nixos/programs/niri.nix}   |  0
 .../nixos/programs/ssh.nix                    |  0
 modules/nixos/services/default.nix            |  9 ++++++
 .../{ => services}/homeserver/authentik.nix   |  0
 .../nixos/{ => services}/homeserver/caddy.nix |  0
 .../{ => services}/homeserver/cloudflared.nix |  0
 .../{ => services}/homeserver/default.nix     |  0
 .../{ => services}/homeserver/nextcloud.nix   |  0
 .../{ => services}/homeserver/restic.nix      |  0
 .../nixos/{ => services}/homeserver/sops.nix  |  0
 .../{ => services}/homeserver/uptime-kuma.nix |  0
 .../{ => services}/homeserver/vaultwarden.nix |  0
 .../{ => services}/homeserver/zipline.nix     |  0
 modules/nixos/{ => services}/mumble.nix       |  0
 .../nixos/services/openssh.nix                |  0
 modules/nixos/{ => services}/tailscale.nix    |  0
 modules/nixos/system/default.nix              | 12 ++++++++
 .../nixos/system/desktop.nix                  |  2 ++
 .../nixos/system}/home-manager.nix            |  0
 modules/nixos/system/scx.nix                  | 10 +++++++
 modules/{common => nixos/system}/stylix.nix   |  0
 {common => modules/nixos/system}/swap.nix     |  0
 modules/{common => nixos/system}/yubikey.nix  |  0
 43 files changed, 86 insertions(+), 83 deletions(-)
 delete mode 100755 common/default.nix
 delete mode 100755 common/networking.nix
 delete mode 100755 common/ssh/default.nix
 rename {common => modules/common}/boot.nix (52%)
 create mode 100644 modules/common/default-packages.nix
 rename {common => modules/common}/locales.nix (100%)
 create mode 100755 modules/common/networking.nix
 rename {common => modules/common}/nix.nix (100%)
 rename {common => modules/common}/users.nix (100%)
 rename modules/nixos/{ => programs}/bash.nix (100%)
 create mode 100644 modules/nixos/programs/default.nix
 rename modules/nixos/{ => programs}/gaming.nix (100%)
 rename modules/nixos/{ => programs}/git.nix (100%)
 rename modules/nixos/{ => programs}/kde.nix (100%)
 rename modules/{common/niri/default.nix => nixos/programs/niri.nix} (100%)
 rename common/ssh/client.nix => modules/nixos/programs/ssh.nix (100%)
 create mode 100644 modules/nixos/services/default.nix
 rename modules/nixos/{ => services}/homeserver/authentik.nix (100%)
 rename modules/nixos/{ => services}/homeserver/caddy.nix (100%)
 rename modules/nixos/{ => services}/homeserver/cloudflared.nix (100%)
 rename modules/nixos/{ => services}/homeserver/default.nix (100%)
 rename modules/nixos/{ => services}/homeserver/nextcloud.nix (100%)
 rename modules/nixos/{ => services}/homeserver/restic.nix (100%)
 rename modules/nixos/{ => services}/homeserver/sops.nix (100%)
 rename modules/nixos/{ => services}/homeserver/uptime-kuma.nix (100%)
 rename modules/nixos/{ => services}/homeserver/vaultwarden.nix (100%)
 rename modules/nixos/{ => services}/homeserver/zipline.nix (100%)
 rename modules/nixos/{ => services}/mumble.nix (100%)
 rename common/ssh/server.nix => modules/nixos/services/openssh.nix (100%)
 rename modules/nixos/{ => services}/tailscale.nix (100%)
 create mode 100644 modules/nixos/system/default.nix
 rename common/desktop/default.nix => modules/nixos/system/desktop.nix (94%)
 rename {common => modules/nixos/system}/home-manager.nix (100%)
 create mode 100644 modules/nixos/system/scx.nix
 rename modules/{common => nixos/system}/stylix.nix (100%)
 rename {common => modules/nixos/system}/swap.nix (100%)
 rename modules/{common => nixos/system}/yubikey.nix (100%)

diff --git a/common/default.nix b/common/default.nix
deleted file mode 100755
index 8409a8e..0000000
--- a/common/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./ssh
-    
-    ./boot.nix
-    ./home-manager.nix
-    ./locales.nix
-    ./networking.nix
-    ./nix.nix
-    ./swap.nix
-    ./users.nix
-  ];
-
-  environment = {
-    systemPackages = with pkgs; [ wget ];
-
-    # remove default packages
-    defaultPackages = lib.mkForce [ ];
-  };
-}
\ No newline at end of file
diff --git a/common/networking.nix b/common/networking.nix
deleted file mode 100755
index e8f1c4c..0000000
--- a/common/networking.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ hostName, config, ... }:
-
-{
-  networking = {
-    networkmanager.enable = true;
-    hostName = "${hostName}";
-  };
-}
\ No newline at end of file
diff --git a/common/ssh/default.nix b/common/ssh/default.nix
deleted file mode 100755
index a50f050..0000000
--- a/common/ssh/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ./client.nix
-    ./server.nix
-  ];
-}
\ No newline at end of file
diff --git a/hosts/Drone/default.nix b/hosts/Drone/default.nix
index a87616a..f352678 100755
--- a/hosts/Drone/default.nix
+++ b/hosts/Drone/default.nix
@@ -4,16 +4,13 @@
   imports = [
     ./hardware-configuration.nix
     
-    ../../common/ssh/server.nix
-    ../../common/boot.nix
-    ../../common/locales.nix
-    ../../common/nix.nix
-    ../../common/users.nix
+    ../../modules/common
 
-    ../../modules/nixos/bash.nix
-    ../../modules/nixos/git.nix
-    ../../modules/nixos/tailscale.nix
-    ../../modules/nixos/homeserver
+    ../../modules/nixos/programs/bash.nix
+    ../../modules/nixos/programs/git.nix
+    ../../modules/nixos/services/openssh.nix
+    ../../modules/nixos/services/tailscale.nix
+    ../../modules/nixos/services/homeserver
   ];
   
   fileSystems = {
@@ -75,15 +72,11 @@
 
   environment.defaultPackages = lib.mkForce [];
 
-  services = {
-    scx.scheduler = lib.mkForce "scx_rusty";
-
-    # for cloudflare browser ssh
-    openssh.settings.Macs = [
-        "hmac-sha2-512"
-        "hmac-sha2-256"
-    ];
-  };
+  # for cloudflare browser ssh
+  services.openssh.settings.Macs = [
+    "hmac-sha2-512"
+    "hmac-sha2-256"
+  ];
 
   system.stateVersion = "25.05";
 }
diff --git a/hosts/Earthmover/default.nix b/hosts/Earthmover/default.nix
index 7487a02..599cc50 100755
--- a/hosts/Earthmover/default.nix
+++ b/hosts/Earthmover/default.nix
@@ -4,11 +4,9 @@
   imports = [
     ./hardware-configuration.nix
 
-    ../../common
-    ../../common/desktop
     ../../modules/common
+    
     ../../modules/nixos
-    ../../modules/nixos/mumble.nix
   ];
 
   fileSystems = {
diff --git a/hosts/Mindflayer/default.nix b/hosts/Mindflayer/default.nix
index 524c0d9..890f135 100644
--- a/hosts/Mindflayer/default.nix
+++ b/hosts/Mindflayer/default.nix
@@ -2,9 +2,9 @@
 
 {
   imports = [
-    ../../common/locales.nix
-    ../../common/nix.nix
-    ../../common/users.nix
+    ../../modules/common/locales.nix
+    ../../modules/common/nix.nix
+    ../../modules/common/users.nix
 
     inputs.nixos-avf.nixosModules.avf
   ];
diff --git a/hosts/Swordsmachine/default.nix b/hosts/Swordsmachine/default.nix
index 9108d13..59be79e 100755
--- a/hosts/Swordsmachine/default.nix
+++ b/hosts/Swordsmachine/default.nix
@@ -4,12 +4,13 @@
   imports = [
     ./hardware-configuration.nix
 
-    ../../common
-    ../../common/desktop
     ../../modules/common
-    ../../modules/nixos
-    
-    ../../modules/common/niri
+
+    ../../modules/nixos/programs
+    ../../modules/nixos/programs/niri.nix
+    ../../modules/nixos/services/openssh.nix
+    ../../modules/nixos/services/tailscale.nix
+    ../../modules/nixos/system
 
     inputs.nixos-hardware.nixosModules.dell-xps-15-9570-nvidia
   ];
diff --git a/common/boot.nix b/modules/common/boot.nix
similarity index 52%
rename from common/boot.nix
rename to modules/common/boot.nix
index 0056d88..656b560 100755
--- a/common/boot.nix
+++ b/modules/common/boot.nix
@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, ... }:
+{ config, ... }:
 
 {
   boot = {
@@ -11,11 +11,4 @@
       efi.canTouchEfiVariables = true;
     };
   };
-
-  services.scx = {
-    enable = true;
-    package = pkgs.scx.rustscheds;
-    # use gaming performance scheduler
-    scheduler = "scx_lavd";
-  };
 }
\ No newline at end of file
diff --git a/modules/common/default-packages.nix b/modules/common/default-packages.nix
new file mode 100644
index 0000000..ac89b83
--- /dev/null
+++ b/modules/common/default-packages.nix
@@ -0,0 +1,5 @@
+{ config, lib, ... }:
+
+{
+  environment.defaultPackages = lib.mkForce [];
+}
\ No newline at end of file
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 8bfa084..2ae5164 100755
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,8 +1,12 @@
-{ config, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports = [
-    ./stylix.nix
-    ./yubikey.nix
+    ./boot.nix
+    ./default-packages.nix
+    ./locales.nix
+    ./networking.nix
+    ./nix.nix
+    ./users.nix
   ];
 }
\ No newline at end of file
diff --git a/common/locales.nix b/modules/common/locales.nix
similarity index 100%
rename from common/locales.nix
rename to modules/common/locales.nix
diff --git a/modules/common/networking.nix b/modules/common/networking.nix
new file mode 100755
index 0000000..c979bb9
--- /dev/null
+++ b/modules/common/networking.nix
@@ -0,0 +1,5 @@
+{ hostName, config, ... }:
+
+{
+  networking.hostName = "${hostName}";
+}
\ No newline at end of file
diff --git a/common/nix.nix b/modules/common/nix.nix
similarity index 100%
rename from common/nix.nix
rename to modules/common/nix.nix
diff --git a/common/users.nix b/modules/common/users.nix
similarity index 100%
rename from common/users.nix
rename to modules/common/users.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index f47206d..512b6bf 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -2,10 +2,8 @@
 
 {
   imports = [
-    ./bash.nix
-    ./gaming.nix
-    ./kde.nix
-    # ./niri.nix
-    ./tailscale.nix
+    ./programs
+    ./services
+    ./system
   ];
 }
\ No newline at end of file
diff --git a/modules/nixos/bash.nix b/modules/nixos/programs/bash.nix
similarity index 100%
rename from modules/nixos/bash.nix
rename to modules/nixos/programs/bash.nix
diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix
new file mode 100644
index 0000000..1e9c1c1
--- /dev/null
+++ b/modules/nixos/programs/default.nix
@@ -0,0 +1,11 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./bash.nix
+    ./gaming.nix
+    ./git.nix
+    ./kde.nix
+    ./ssh.nix
+  ];
+}
\ No newline at end of file
diff --git a/modules/nixos/gaming.nix b/modules/nixos/programs/gaming.nix
similarity index 100%
rename from modules/nixos/gaming.nix
rename to modules/nixos/programs/gaming.nix
diff --git a/modules/nixos/git.nix b/modules/nixos/programs/git.nix
similarity index 100%
rename from modules/nixos/git.nix
rename to modules/nixos/programs/git.nix
diff --git a/modules/nixos/kde.nix b/modules/nixos/programs/kde.nix
similarity index 100%
rename from modules/nixos/kde.nix
rename to modules/nixos/programs/kde.nix
diff --git a/modules/common/niri/default.nix b/modules/nixos/programs/niri.nix
similarity index 100%
rename from modules/common/niri/default.nix
rename to modules/nixos/programs/niri.nix
diff --git a/common/ssh/client.nix b/modules/nixos/programs/ssh.nix
similarity index 100%
rename from common/ssh/client.nix
rename to modules/nixos/programs/ssh.nix
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
new file mode 100644
index 0000000..490a52c
--- /dev/null
+++ b/modules/nixos/services/default.nix
@@ -0,0 +1,9 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./mumble.nix
+    ./openssh.nix
+    ./tailscale.nix
+  ];
+}
\ No newline at end of file
diff --git a/modules/nixos/homeserver/authentik.nix b/modules/nixos/services/homeserver/authentik.nix
similarity index 100%
rename from modules/nixos/homeserver/authentik.nix
rename to modules/nixos/services/homeserver/authentik.nix
diff --git a/modules/nixos/homeserver/caddy.nix b/modules/nixos/services/homeserver/caddy.nix
similarity index 100%
rename from modules/nixos/homeserver/caddy.nix
rename to modules/nixos/services/homeserver/caddy.nix
diff --git a/modules/nixos/homeserver/cloudflared.nix b/modules/nixos/services/homeserver/cloudflared.nix
similarity index 100%
rename from modules/nixos/homeserver/cloudflared.nix
rename to modules/nixos/services/homeserver/cloudflared.nix
diff --git a/modules/nixos/homeserver/default.nix b/modules/nixos/services/homeserver/default.nix
similarity index 100%
rename from modules/nixos/homeserver/default.nix
rename to modules/nixos/services/homeserver/default.nix
diff --git a/modules/nixos/homeserver/nextcloud.nix b/modules/nixos/services/homeserver/nextcloud.nix
similarity index 100%
rename from modules/nixos/homeserver/nextcloud.nix
rename to modules/nixos/services/homeserver/nextcloud.nix
diff --git a/modules/nixos/homeserver/restic.nix b/modules/nixos/services/homeserver/restic.nix
similarity index 100%
rename from modules/nixos/homeserver/restic.nix
rename to modules/nixos/services/homeserver/restic.nix
diff --git a/modules/nixos/homeserver/sops.nix b/modules/nixos/services/homeserver/sops.nix
similarity index 100%
rename from modules/nixos/homeserver/sops.nix
rename to modules/nixos/services/homeserver/sops.nix
diff --git a/modules/nixos/homeserver/uptime-kuma.nix b/modules/nixos/services/homeserver/uptime-kuma.nix
similarity index 100%
rename from modules/nixos/homeserver/uptime-kuma.nix
rename to modules/nixos/services/homeserver/uptime-kuma.nix
diff --git a/modules/nixos/homeserver/vaultwarden.nix b/modules/nixos/services/homeserver/vaultwarden.nix
similarity index 100%
rename from modules/nixos/homeserver/vaultwarden.nix
rename to modules/nixos/services/homeserver/vaultwarden.nix
diff --git a/modules/nixos/homeserver/zipline.nix b/modules/nixos/services/homeserver/zipline.nix
similarity index 100%
rename from modules/nixos/homeserver/zipline.nix
rename to modules/nixos/services/homeserver/zipline.nix
diff --git a/modules/nixos/mumble.nix b/modules/nixos/services/mumble.nix
similarity index 100%
rename from modules/nixos/mumble.nix
rename to modules/nixos/services/mumble.nix
diff --git a/common/ssh/server.nix b/modules/nixos/services/openssh.nix
similarity index 100%
rename from common/ssh/server.nix
rename to modules/nixos/services/openssh.nix
diff --git a/modules/nixos/tailscale.nix b/modules/nixos/services/tailscale.nix
similarity index 100%
rename from modules/nixos/tailscale.nix
rename to modules/nixos/services/tailscale.nix
diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
new file mode 100644
index 0000000..e57fd46
--- /dev/null
+++ b/modules/nixos/system/default.nix
@@ -0,0 +1,12 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./desktop.nix
+    ./home-manager.nix
+    ./scx.nix
+    ./stylix.nix
+    ./swap.nix
+    ./yubikey.nix
+  ];
+}
\ No newline at end of file
diff --git a/common/desktop/default.nix b/modules/nixos/system/desktop.nix
similarity index 94%
rename from common/desktop/default.nix
rename to modules/nixos/system/desktop.nix
index 0bf345c..ab1e56e 100755
--- a/common/desktop/default.nix
+++ b/modules/nixos/system/desktop.nix
@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  networking.networkmanager.enable = true;
+
   hardware = {
     bluetooth = {
       enable = true;
diff --git a/common/home-manager.nix b/modules/nixos/system/home-manager.nix
similarity index 100%
rename from common/home-manager.nix
rename to modules/nixos/system/home-manager.nix
diff --git a/modules/nixos/system/scx.nix b/modules/nixos/system/scx.nix
new file mode 100644
index 0000000..d79e63b
--- /dev/null
+++ b/modules/nixos/system/scx.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  services.scx = {
+    enable = true;
+    package = pkgs.scx.rustscheds;
+    # use gaming performance scheduler
+    scheduler = "scx_lavd";
+  };
+}
\ No newline at end of file
diff --git a/modules/common/stylix.nix b/modules/nixos/system/stylix.nix
similarity index 100%
rename from modules/common/stylix.nix
rename to modules/nixos/system/stylix.nix
diff --git a/common/swap.nix b/modules/nixos/system/swap.nix
similarity index 100%
rename from common/swap.nix
rename to modules/nixos/system/swap.nix
diff --git a/modules/common/yubikey.nix b/modules/nixos/system/yubikey.nix
similarity index 100%
rename from modules/common/yubikey.nix
rename to modules/nixos/system/yubikey.nix