Reorganize imports

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

README.md

@@ -8,20 +8,13 @@ NixOS dotfiles and configuration for various hosts and users.
 
 - [`hosts/`](./hosts): All host-specific configurations.
   - [`common/`](./hosts/common): Shared configuration definitions.
-    - [`system/`](./hosts/common/system): System-level configurations and scripts.
+    - [`shells/`](./hosts/common/shells): Nix dev shells.
-      - [`configs/`](./hosts/common/system/configs): System configurations applicable to all hosts.
+    - [`configs/`](./hosts/common/configs): System configurations applicable to all hosts.
-      - [`scripts/`](./hosts/common/system/scripts): Utility scripts, such as `nix-cleanup`.
+      - [`system/`](./hosts/common/configs/system): System-level configurations and scripts.
-      - [`shells/`](./hosts/common/system/shells): Nix dev shells.
+      - [`user/`](./hosts/common/configs/user): Per-user options.
-    - [`user/`](./hosts/common/user): Per-user options.
+        - [`console/`](./hosts/common/configs/user/console): Console-related settings.
-      - [`configs/`](./hosts/common/user/configs): User configurations, split into:
+        - [`gui/`](./hosts/common/configs/user/gui): GUI-related settings.
-        - [`console/`](./hosts/common/user/configs/console): Console-related settings.
-        - [`gui/`](./hosts/common/user/configs/gui): GUI-related settings.
-      - [`scripts/`](./hosts/common/user/scripts): User-specific scripts and utilities.
   - `<name>/`: Individual host configurations.
-    - `scripts/`: Host-specific scripts.
-    - `secrets/`: Host-specific secrets, such as `machineId`.
-    - `users/`: User-specific settings for the host.
-    - `format.nix`: Disk layout definition using [`disko`](https://github.com/nix-community/disko).
 
 - `secrets/<namespace>/`: Global secrets for individual namespaces that apply across all hosts.
 

flake.nix

@@ -101,10 +101,10 @@
       in
       {
         devShells = {
-          bun = import ./hosts/common/system/shells/bun { inherit pkgs; };
+          bun = import ./hosts/common/shells/bun { inherit pkgs; };
-          nix = import ./hosts/common/system/shells/nix { inherit pkgs; };
+          nix = import ./hosts/common/shells/nix { inherit pkgs; };
-          nodejs = import ./hosts/common/system/shells/nodejs { inherit pkgs; };
+          nodejs = import ./hosts/common/shells/nodejs { inherit pkgs; };
-          python = import ./hosts/common/system/shells/python { inherit pkgs; };
+          python = import ./hosts/common/shells/python { inherit pkgs; };
         };
 
         formatter = pkgs.nixfmt-rfc-style;