common: move to modules, move some files out, modules: adjust dir structure

common/default.nix

@@ -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 [ ];
-  };
-}

common/networking.nix

@@ -1,8 +0,0 @@
-{ hostName, config, ... }:
-
-{
-  networking = {
-    networkmanager.enable = true;
-    hostName = "${hostName}";
-  };
-}

common/ssh/default.nix

@@ -1,8 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ./client.nix
-    ./server.nix
-  ];
-}

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 = [
+  services.openssh.settings.Macs = [
     "hmac-sha2-512"
     "hmac-sha2-256"
   ];
-  };
 
   system.stateVersion = "25.05";
 }

hosts/Earthmover/default.nix

@@ -4,11 +4,9 @@
   imports = [
     ./hardware-configuration.nix
 
-    ../../common
-    ../../common/desktop
     ../../modules/common
+    
     ../../modules/nixos
-    ../../modules/nixos/mumble.nix
   ];
 
   fileSystems = {

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
   ];

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
   ];

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";
-  };
 }

modules/common/default-packages.nix

@@ -0,0 +1,5 @@
+{ config, lib, ... }:
+
+{
+  environment.defaultPackages = lib.mkForce [];
+}

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
   ];
 }

modules/common/networking.nix

@@ -0,0 +1,5 @@
+{ hostName, config, ... }:
+
+{
+  networking.hostName = "${hostName}";
+}

modules/nixos/default.nix

@@ -2,10 +2,8 @@
 
 {
   imports = [
-    ./bash.nix
-    ./gaming.nix
-    ./kde.nix
-    # ./niri.nix
-    ./tailscale.nix
+    ./programs
+    ./services
+    ./system
   ];
 }

modules/nixos/programs/default.nix

@@ -0,0 +1,11 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./bash.nix
+    ./gaming.nix
+    ./git.nix
+    ./kde.nix
+    ./ssh.nix
+  ];
+}

modules/nixos/services/default.nix

@@ -0,0 +1,9 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./mumble.nix
+    ./openssh.nix
+    ./tailscale.nix
+  ];
+}

modules/nixos/system/default.nix

@@ -0,0 +1,12 @@
+{ config, ... }:
+
+{
+  imports = [
+    ./desktop.nix
+    ./home-manager.nix
+    ./scx.nix
+    ./stylix.nix
+    ./swap.nix
+    ./yubikey.nix
+  ];
+}

modules/nixos/system/desktop.nix

@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  networking.networkmanager.enable = true;
+
   hardware = {
     bluetooth = {
       enable = true;

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";
+  };
+}