move common modules under modules/

Simplify the import on the various hosts.

13 files changed, 16 insertions, 22 deletions

diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
index e9d78eb..766edf1 100644
--- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
+++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix
@@ -18,13 +18,7 @@
       };
     }
     "${self}/profiles/programs/home-manager.nix"
-    "${self}/profiles/darwin/desktop.nix"
-    "${self}/profiles/darwin/keyboard.nix"
-    "${self}/profiles/darwin/nix.nix"
-    "${self}/profiles/darwin/security.nix"
     "${self}/profiles/desktop/fonts.nix"
-    "${self}/profiles/programs/fish.nix"
-    "${self}/profiles/programs/ssh.nix"
   ];
 
   system.primaryUser = adminUser.name;
diff --git a/machines/darwin/aarch64-darwin/mba-m2/default.nix b/machines/darwin/aarch64-darwin/mba-m2/default.nix
index d2f66bf..841352d 100644
--- a/machines/darwin/aarch64-darwin/mba-m2/default.nix
+++ b/machines/darwin/aarch64-darwin/mba-m2/default.nix
@@ -19,13 +19,6 @@
     }
     "${self}/profiles/programs/home-manager.nix"
     "${self}/profiles/nix/remote-builder.nix"
-    "${self}/profiles/darwin/desktop.nix"
-    "${self}/profiles/darwin/keyboard.nix"
-    "${self}/profiles/darwin/nix.nix"
-    "${self}/profiles/darwin/security.nix"
-    "${self}/profiles/desktop/fonts.nix"
-    "${self}/profiles/programs/fish.nix"
-    "${self}/profiles/programs/ssh.nix"
   ];
 
   system.primaryUser = adminUser.name;
diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix
index 061a6ca..20a048f 100644
--- a/machines/nixos/x86_64-linux/do-rproxy/default.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix
@@ -29,7 +29,6 @@
     "${self}/profiles/network/firewall.nix"
     "${self}/profiles/network/fail2ban.nix"
     "${self}/profiles/services/podman.nix"
-    "${self}/profiles/programs/fish.nix"
     ./profiles/nginx.nix
   ];
 
diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix
index 97eafaf..34d9962 100644
--- a/machines/nixos/x86_64-linux/synology-vm/default.nix
+++ b/machines/nixos/x86_64-linux/synology-vm/default.nix
@@ -24,7 +24,6 @@
     "${self}/profiles/network/networkd.nix"
     "${self}/profiles/network/firewall.nix"
     "${self}/profiles/services/podman.nix"
-    "${self}/profiles/programs/fish.nix"
     ./profiles/forgejo.nix
     ./profiles/keycloak.nix
     ./profiles/goget.nix
diff --git a/modules/common/default.nix b/modules/common/default.nix
index b42a079..5a0da5f 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,7 +1,9 @@
 { ... }:
 {
   imports = [
+    ./fish.nix
     ./home.nix
     ./host-config.nix
+    ./ssh.nix
   ];
 }
diff --git a/profiles/programs/fish.nix b/modules/common/fish.nix
index 21fdf98..21fdf98 100644
--- a/profiles/programs/fish.nix
+++ b/modules/common/fish.nix
diff --git a/profiles/programs/ssh.nix b/modules/common/ssh.nix
index 3e975ee..3e975ee 100644
--- a/profiles/programs/ssh.nix
+++ b/modules/common/ssh.nix
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
new file mode 100644
index 0000000..674e042
--- /dev/null
+++ b/modules/darwin/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  imports = [
+    ./desktop.nix
+    ./keyboard.nix
+    ./nix.nix
+    ./security.nix
+  ];
+}
diff --git a/profiles/darwin/desktop.nix b/modules/darwin/desktop.nix
index a5ca970..55cef64 100644
--- a/profiles/darwin/desktop.nix
+++ b/modules/darwin/desktop.nix
@@ -1,5 +1,9 @@
-{ ... }:
+{ pkgs, ... }:
 {
+  fonts.packages = with pkgs; [
+    source-code-pro
+  ];
+
   system.defaults = {
     dock = {
       autohide = true;
diff --git a/profiles/darwin/keyboard.nix b/modules/darwin/keyboard.nix
index c460bac..c460bac 100644
--- a/profiles/darwin/keyboard.nix
+++ b/modules/darwin/keyboard.nix
diff --git a/profiles/darwin/nix.nix b/modules/darwin/nix.nix
index 56d85ca..56d85ca 100644
--- a/profiles/darwin/nix.nix
+++ b/modules/darwin/nix.nix
diff --git a/profiles/darwin/security.nix b/modules/darwin/security.nix
index 178fca1..178fca1 100644
--- a/profiles/darwin/security.nix
+++ b/modules/darwin/security.nix
diff --git a/profiles/desktop/fonts.nix b/profiles/desktop/fonts.nix
deleted file mode 100644
index 5767d3a..0000000
--- a/profiles/desktop/fonts.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  fonts.packages = with pkgs; [
-    source-code-pro
-  ];
-}