updated docs

3 files changed, 45 insertions, 36 deletions

diff --git a/docs/layout.md b/docs/layout.md
index c52b288..936b290 100644
--- a/docs/layout.md
+++ b/docs/layout.md
@@ -2,8 +2,9 @@
 
 # Layout
 
-- features/: Simple reusable configurations (only create an enable option and maybe one other).
-  - system/
+- nixos/: NixOS-specific configurations.
+
+  - features/: Simple reusable configurations (only create an enable option and maybe one other).
     - gui/: Graphical configurations.
       - desktops/: Desktop environments, compositors, window managers, etc.
       - apps/: Graphical apps.
@@ -27,11 +28,31 @@
       - cloud/: Server apps for file storage (e.g. Syncthing, Nextcloud).
       - development/: Server apps to assist in development (e.g. Git server setup).
       - gaming/: Game servers (e.g. Minecraft).
-  - user/
+
+  - modules/: Custom nix modules (Can create any amount of options).
+
+  - systems/: System-specific nixos configurations.
+
+    - nzxt-desktop/
+      - system.nix
+      - hardware.nix
+    - ideapad-laptop/
+      - system.nix
+      - hardware.nix
+    - prodesk-server/
+      - system.nix
+      - hardware.nix
+    - pendrive-iso/
+      - system.nix
+      - hardware.nix
+
+- home-manager/: Home manager specific configurations.
+
+  - features/: Simple reusable configurations (only create an enable option and maybe one other).
     - gui/: Graphical configurations.
-      - desktops/
-      - apps/
-      - bundles/
+      - desktops/: Desktop environments, compositors, window managers, etc.
+      - apps/: Graphical apps.
+      - bundles/: Collections of gui configurations.
     - cli/
       - scripts/
       - apps/
@@ -40,37 +61,25 @@
     - services/
     - global/
       - home-manager.nix
-- modules/: Custom nix modules (Can create any amount of options).
-  - system/: Custom nixos modules.
-  - user/: Custom home-manager modules.
+
+  - modules/: Custom nix modules (Can create any amount of options).
     - aesthetics/
-      - default.nix
-      - targets/
-      - themes/
+    - default.nix
+    - targets/
+    - themes/
+
+  - users/: User specific home manager configurations
+    - nzxt-desktop/
+      - culsans.nix
+    - ideapad-laptop/
+      - lucas.nix
+    - prodesk-server/
+      - server.nix
+    - pendrive-iso/
+      - pendrive.nix
+
 - secrets/: Age-encrypted secrets integrated with nixos.
   - user-passwords/
     - culsans.age
     - lucas.age
     - server.age
-- users/: User specific home manager configurations
-  - nzxt-desktop/
-    - culsans.nix
-  - ideapad-laptop/
-    - lucas.nix
-  - prodesk-server/
-    - server.nix
-  - pendrive-iso/
-    - pendrive.nix
-- systems/: System-specific nixos configurations.
-  - nzxt-desktop/
-    - system.nix
-    - hardware.nix
-  - ideapad-laptop/
-    - system.nix
-    - hardware.nix
-  - prodesk-server/
-    - system.nix
-    - hardware.nix
-  - pendrive-iso/
-    - system.nix
-    - hardware.nix
diff --git a/docs/todo.md b/docs/todo.md
index cfaa03b..738065c 100644
--- a/docs/todo.md
+++ b/docs/todo.md
@@ -6,7 +6,7 @@
 
 - make keyboard layout switchable
 - find a password manager
-- make office, coding, art, video, and gamedev bundles.
+- make gamedev bundle
 
 ## Issues
 
diff --git a/readme.md b/readme.md
index 918e723..7d7f3b8 100644
--- a/readme.md
+++ b/readme.md
@@ -27,7 +27,7 @@ This repo contains multi-device configurations for nixos and home-manager, inclu
 ## Devices
 
 - nzxt-desktop: My custom-built desktop pc in an nzxt case (not actually made by nzxt).
-- ideapad-laptop: My cheap lenovo ideapad I use for schoolwork.
+- thinkpad-laptop: My old thinkpad T460.
 - prodesk-server: My home server running on an hp prodesk desktop.
 - steam-deck: My steam deck running nixos with jovian-nixos.