Big refactor, test first

home-manager/hosts/EDI/default.nix

@@ -0,0 +1,13 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  # You can import other home-manager modules here
+  imports = [
+    ./lillian.nix
+  ];
+}

home-manager/hosts/EDI/lillian.nix

@@ -18,8 +18,8 @@
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
-    ../../desktop/configuration.nix
+    ../../desktop
-    ./package-configs/plasma-desktop/configuration.nix
+    ./package-configs/plasma-desktop
   ];
 
   home.packages = with pkgs; [

home-manager/hosts/GLaDOS/default.nix

@@ -0,0 +1,13 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  # You can import other home-manager modules here
+  imports = [
+    ./lillian.nix
+  ];
+}

home-manager/hosts/GLaDOS/lillian.nix

@@ -18,8 +18,8 @@
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
-    ../../desktop/configuration.nix
+    ../../desktop
-    ./package-configs/plasma-desktop/configuration.nix
+    ./package-configs/plasma-desktop
   ];
 
   home.packages = with pkgs; [

nixos/desktop/default.nix

@@ -9,11 +9,8 @@
   ...
 }: {
   imports = [
-    # Import locale settings
-    ../shared/locale/configuration.nix
-
     # Import shared packages
-    ../shared/packages/configuration.nix
+    ../shared
   ];
   nixpkgs = {
     # You can add overlays here

nixos/hosts/EDI/configuration.nix

@@ -22,7 +22,7 @@
     # You can also split up your configuration and import pieces of it here:
     # ./users.nix
 
-    ../../desktop/configuration.nix
+    ../../desktop
 
     # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix
@@ -32,7 +32,7 @@
     extraSpecialArgs = {inherit inputs outputs;};
     users = {
       # Import your home-manager configuration
-      lillian = import ../../../home-manager/hosts/EDI/EDI-Lillian.nix;
+      lillian = import ../../../home-manager/hosts/EDI;
     };
   };
 

nixos/hosts/GLaDOS/configuration.nix

@@ -22,7 +22,7 @@
     # You can also split up your configuration and import pieces of it here:
     # ./users.nix
 
-    ../../desktop/configuration.nix
+    ../../desktop
 
     # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix

nixos/hosts/queen/configuration.nix

@@ -18,24 +18,11 @@
     # ./nvim.nix
     ./hardware-configuration.nix
 
-    # Import locale settings
+    # Import shared settings
-    ../../shared/locale/configuration.nix
+    ../../shared
-
-    # Import shared packages
-    ../../shared/packages/configuration.nix
 
     #../../server/package-configs/akkoma/configuration.nix
-    ../../server/package-configs/forgejo/configuration.nix
+    ../../server
-    ../../server/package-configs/gotosocial/configuration.nix
-    ../../server/package-configs/mail-server/configuration.nix
-    ../../server/package-configs/nextcloud/configuration.nix
-    ../../server/package-configs/postgres/configuration.nix
-    ../../server/package-configs/postgres/upgrade.nix
-    ../../server/package-configs/roundcube/configuration.nix
-    ../../server/package-configs/jellyfin/configuration.nix
-    ../../server/package-configs/ombi/configuration.nix
-    ../../server/package-configs/aria2/configuration.nix
-    ../../server/package-configs/conduit/configuration.nix
   ];
 
   boot.tmp.cleanOnBoot = true;

nixos/hosts/shodan/configuration.nix

@@ -16,7 +16,7 @@
     # inputs.nix-colors.homeManagerModules.default
 
     # Import the locale settings
-    ../../shared/locale/configuration.nix
+    ../../shared
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix

nixos/hosts/wheatley/configuration.nix

@@ -16,10 +16,10 @@
     ./hardware-configuration.nix
 
     # Import locale settings
-    ../../shared/locale/configuration.nix
+    ../../shared/locale
 
     # Import shared packages
-    ../../shared/packages/configuration.nix
+    ../../shared/packages
   ];
 
   boot.loader.generic-extlinux-compatible.enable = true;

nixos/server/package-configs/default.nix

@@ -0,0 +1,22 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./aria2
+    ./conduit
+    ./dex
+    ./forgejo
+    ./gotosocial
+    ./jellyfin
+    ./mail-server
+    ./nextcloud
+    ./ombi
+    ./postgres
+    ./roundcube
+  ];
+}

nixos/shared/default.nix

@@ -0,0 +1,13 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./locale
+    ./packages
+  ];
+}

nixos/shared/packages/default.nix

@@ -20,6 +20,7 @@
     spacevim
     wget
     zsh
+    tldr
 
     # System libraries
     noto-fonts