Restructure modules/shared and update all imports

- Delete 2024-12-rework/ folder
- Rename modules/hosts/common to modules/shared, then split into:
  - modules/shared/home/general
  - modules/shared/home/linux
  - modules/shared/nixos
- Update all import paths throughout the codebase
- Update lib/*.nix to use new paths
- Fix hardcoded /Users/${username} to use config.home.homeDirectory
- Update README and examples/flake-structure.nix

modules/hosts/nixos/bigboy/default.nix

@@ -10,8 +10,8 @@
 {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../common/linux/flatpaks.nix
-    ../../common/linux/ripping.nix
+    ../../../shared/nixos/flatpaks.nix
+    ../../../shared/nixos/ripping.nix
   ];
 
   system.stateVersion = "24.11"; # Did you read the comment?

modules/hosts/nixos/bigboy/home-gene.nix

@@ -1,9 +1,9 @@
 { ... }: {
   home.stateVersion = "24.05";
   imports = [
-    ../../common/all-gui.nix
-    ../../common/linux/apps/tilix.nix
-    ../../common/linux/apps/xfce4-terminal.nix
+    ../../../shared/home/general/all-gui.nix
+    ../../../shared/home/linux/apps/tilix.nix
+    ../../../shared/home/linux/apps/xfce4-terminal.nix
   ];
 
   programs = {

modules/hosts/nixos/default.nix

@@ -1,6 +1,6 @@
 { hostname, pkgs, username, ... }: {
   imports = [
-    ../common/linux/internationalisation.nix
+        ../../shared/nixos/internationalisation.nix
   ];
 
   environment = {

modules/hosts/nixos/hetznix01/default.nix

@@ -1,6 +1,6 @@
 { inputs, pkgs, username,  ... }: {
   imports = [
-    ../../common/linux/nixroutes.nix
+    ../../../shared/nixos/nixroutes.nix
     ./disk-config.nix
     ./hardware-configuration.nix
     ./post-install

modules/hosts/nixos/hetznix01/post-install/default.nix

@@ -3,8 +3,8 @@
   restic_backup_time = "01:00";
 in {
   imports = [
-    ../../../common/linux/lets-encrypt.nix
-    ../../../common/linux/restic.nix
+    ../../../../shared/nixos/lets-encrypt.nix
+    ../../../../shared/nixos/restic.nix
     ./containers/emqx.nix
     ./matrix-synapse.nix
     ./monitoring.nix

modules/hosts/nixos/hetznix01/post-install/monitoring.nix

@@ -120,7 +120,7 @@ in {
       vmagent_push_pw = {
         owner = "vmagent";
         restartUnits = ["vmagent.service"];
-        sopsFile = ../../../common/secrets.yaml;
+        sopsFile = ../../../../shared/secrets.yaml;
       };
     };
   };

modules/hosts/nixos/hetznix02/default.nix

@@ -1,6 +1,6 @@
 { inputs, pkgs, username,  ... }: {
   imports = [
-    ../../common/linux/nixroutes.nix
+    ../../../shared/nixos/nixroutes.nix
     ./disk-config.nix
     ./hardware-configuration.nix
     ./post-install

modules/hosts/nixos/hetznix02/post-install/default.nix

@@ -1,6 +1,6 @@
 { config, username, ... }: {
   imports = [
-    ../../../common/linux/lets-encrypt.nix
+    ../../../../shared/nixos/lets-encrypt.nix
     ./monitoring.nix
     ./nginx.nix
   ];

modules/hosts/nixos/hetznix02/post-install/monitoring.nix

@@ -120,7 +120,7 @@ in {
       vmagent_push_pw = {
         owner = "vmagent";
         restartUnits = ["vmagent.service"];
-        sopsFile = ../../../common/secrets.yaml;
+        sopsFile = ../../../../shared/secrets.yaml;
       };
     };
   };

modules/hosts/nixos/kiosk-entryway/default.nix

@@ -97,7 +97,7 @@
         path = "${config.users.users.${username}.home}/.private-env";
       };
       wifi_creds = {
-        sopsFile = ../../common/secrets.yaml;
+        sopsFile = ../../../shared/secrets.yaml;
         restartUnits = [
           "wpa_supplicant.service"
         ];

modules/hosts/nixos/kiosk-entryway/monitoring.nix

@@ -120,7 +120,7 @@ in {
       vmagent_push_pw = {
         owner = "vmagent";
         restartUnits = ["vmagent.service"];
-        sopsFile = ../../../common/secrets.yaml;
+        sopsFile = ../../../../shared/secrets.yaml;
       };
     };
   };

modules/hosts/nixos/kiosk-gene-desk/default.nix

@@ -90,7 +90,7 @@
         path = "${config.users.users.${username}.home}/.private-env";
       };
       wifi_creds = {
-        sopsFile = ../../common/secrets.yaml;
+        sopsFile = ../../../shared/secrets.yaml;
         restartUnits = [
           "wpa_supplicant.service"
         ];

modules/hosts/nixos/nixnas1/default.nix

@@ -2,7 +2,7 @@
   imports = [
     ./disk-config.nix
     ./hardware-configuration.nix
-    ../../../system/common/linux/restic.nix
+    ../../../shared/nixos/restic.nix
   ];
 
   system.stateVersion = "24.05";

modules/hosts/nixos/nixnuc/default.nix

@@ -11,8 +11,8 @@ in {
     ./containers/mountain-mesh-bot-discord.nix
     ./containers/psitransfer.nix
     ./monitoring-stack.nix
-    ../../common/linux/lets-encrypt.nix
-    ../../common/linux/restic.nix
+    ../../../shared/nixos/lets-encrypt.nix
+    ../../../shared/nixos/restic.nix
   ];
 
   system.stateVersion = "23.11";

modules/hosts/nixos/nixnuc/monitoring-stack.nix

@@ -363,7 +363,7 @@ in {
       uptimekuma_grafana_api_key = {
         owner = "vmagent";
         restartUnits = ["vmagent.service"];
-        sopsFile = ../../common/secrets.yaml;
+        sopsFile = ../../../shared/secrets.yaml;
       };
     };
   };

modules/hosts/nixos/rainbow-planet/default.nix

@@ -1,8 +1,8 @@
 { inputs, config, pkgs, username, ... }: {
   imports = [
     ./hardware-configuration.nix
-    ../../common/linux/flatpaks.nix
-    ../../common/linux/ripping.nix
+    ../../../shared/nixos/flatpaks.nix
+    ../../../shared/nixos/ripping.nix
   ];
 
   system.stateVersion = "23.05";

modules/hosts/nixos/rainbow-planet/home-gene.nix

@@ -1,12 +1,12 @@
 { pkgs, ... }: {
   home.stateVersion = "23.11";
   imports = [
-    ../../common/all-gui.nix
-    ../../common/linux/apps/hexchat.nix
-    ../../common/linux/apps/pidgin.nix
-    ../../common/linux/apps/tilix.nix
-    ../../common/linux/apps/waybar.nix
-    ../../common/linux/apps/xfce4-terminal.nix
+    ../../../shared/home/general/all-gui.nix
+    ../../../shared/home/linux/apps/hexchat.nix
+    ../../../shared/home/linux/apps/pidgin.nix
+    ../../../shared/home/linux/apps/tilix.nix
+    ../../../shared/home/linux/apps/waybar.nix
+    ../../../shared/home/linux/apps/xfce4-terminal.nix
   ];
 
   home.file = {

modules/shared/home/general/default.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, username, ... }: let
+{ config, inputs, pkgs, ... }: let
   sqlite_lib = if builtins.elem pkgs.stdenv.hostPlatform.system [
                  "aarch64-darwin"
                  "x86_64-darwin"
@@ -166,7 +166,7 @@ in {
     };
     nh = {
       enable = true;
-      flake = "/Users/${username}/repos/dots";
+      flake = "${config.home.homeDirectory}/repos/dots";
     };
     oh-my-posh = {
       enable = true;
@@ -353,14 +353,14 @@ in {
 
   home.file = {
     ".config/nvim/lua/config" = {
-      source = ./files/nvim/lua/config;
+      source = ../../files/nvim/lua/config;
       recursive = true;
     };
     ".config/nvim/lua/plugins" = {
-      source = ./files/nvim/lua/plugins;
+      source = ../../files/nvim/lua/plugins;
       recursive = true;
     };
-    ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
-    ".config/powershell/Microsoft.VSCode_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
+    ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ../../files/Microsoft.PowerShell_profile.ps1;
+    ".config/powershell/Microsoft.VSCode_profile.ps1".source = ../../files/Microsoft.PowerShell_profile.ps1;
   };
 }

modules/shared/home/linux/apps/tilix.nix

@@ -19,7 +19,7 @@
   };
 
   home.file = {
-    ".config/tilix/schemes/Beanbag-Mathias.json".source = ../../files/tilix/Beanbag-Mathias.json;
+    ".config/tilix/schemes/Beanbag-Mathias.json".source = ../../../files/tilix/Beanbag-Mathias.json;
     ".config/tilix/schemes/Catppuccin-Frappe.json".source = (pkgs.fetchFromGitHub {
       owner = "catppuccin";
       repo = "tilix";

modules/shared/home/linux/apps/waybar.nix

@@ -1,13 +1,13 @@
 { pkgs, ... }: {
   home.file = {
-    ".config/waybar/config".source = ../../files/waybar/config;
+    ".config/waybar/config".source = ../../../files/waybar/config;
     ".config/waybar/frappe.css".source = (pkgs.fetchFromGitHub {
       owner = "catppuccin";
       repo = "waybar";
       rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
       hash = "sha256-WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
     } + "/themes/frappe.css");
-    ".config/waybar/style.css".source = ../../files/waybar/style.css;
+    ".config/waybar/style.css".source = ../../../files/waybar/style.css;
   };
 
    programs = {

modules/shared/home/linux/apps/xfce4-terminal.nix

@@ -1,6 +1,6 @@
 { ... }: {
   home.file = {
-    ".config/xfce4/terminal/accels.scm".source = ../../files/xfce4/terminal/accels.scm;
+    ".config/xfce4/terminal/accels.scm".source = ../../../files/xfce4/terminal/accels.scm;
   };
 
   xfconf.settings = {