another one :D

home/bin/default.nix

@@ -0,0 +1,13 @@
+{
+  imports = [
+    # shared apps
+    ./browsers
+    ./discord
+    ./utility
+    ./alacritty
+    ./foot
+    ./neovim
+    ./kitty
+    ./yazi
+  ];
+}

home/core/default.nix

@@ -1,23 +0,0 @@
-{
-  imports = [
-    # ./gui/anyrun
-    ./gui/browsers
-    ./gui/discord
-    ./gui/utility
-    ./gui/waybar
-    ./gui/xdg
-    ./gui/style
-
-    ./tui/alacritty
-    ./tui/foot
-    ./tui/neovim
-    ./tui/kitty
-    ./tui/yazi
-
-    ./services/copyq
-    ./services/hypr
-    ./services/mako
-    ./services/polkit
-    ./services/udiskie
-  ];
-}

home/core/gui/style/default.nix

@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./gtk.nix
-    ./dconf.nix
-    # ./qt.nix
-    # ./global.nix
-  ];
-}

home/default.nix

@@ -8,25 +8,31 @@
 
   homeImports = {
     "cnst@cnix" = [
-      ./core/gui/hypr/cnst.nix
+      ./usr/share/git/cnst
-      ./core/tui/git/cnst.nix
+      ./usr/share/shell/cnst
-      ./core/tui/shell/cnst.nix
+      ./etc/hyprland/cnst
-      ./core
+      ./etc
-      ./users/cnst
+      ./bin
+      ./srv
+      ./profiles/cnst
     ];
     "adam@adampad" = [
-      ./core/gui/hypr/cnst.nix
+      ./usr/share/git/cnst
-      ./core/tui/git/cnst.nix
+      ./usr/share/shell/adam
-      ./core/tui/shell/adam.nix
+      ./etc/hyprland/cnst
-      ./core
+      ./etc
-      ./users/adam
+      ./bin
+      ./srv
+      ./profiles/adam
     ];
     "toothpick@toothpc" = [
-      ./core/gui/hypr/toothpick.nix
+      ./usr/share/git/toothpick
-      ./core/tui/git/toothpick.nix
+      ./usr/share/shell/toothpick
-      ./core/tui/shell/toothpick.nix
+      ./etc/hyprland/toothpick
-      ./core
+      ./etc
-      ./users/toothpick
+      ./bin
+      ./srv
+      ./profiles/toothpick
     ];
   };
 

home/etc/default.nix

@@ -0,0 +1,10 @@
+{
+  imports = [
+    # shared imports
+    ./dconf
+    ./gtk
+    ./neovim
+    ./waybar
+    ./xdg
+  ];
+}

home/etc/hyprland/cnst/default.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     inputs.hyprland.homeManagerModules.default
-    ./land/cnst
+    ./cfg
   ];
 
   wayland.windowManager.hyprland = {

home/etc/hyprland/toothpick/default.nix

@@ -1,7 +1,7 @@
 {inputs, ...}: {
   imports = [
     inputs.hyprland.homeManagerModules.default
-    ./land/toothpick
+    ./cfg
   ];
   wayland.windowManager.hyprland = {
     enable = true;

home/srv/default.nix

@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./copyq
+    ./hypr
+    ./mako
+    ./polkit
+    ./udiskie
+  ];
+}

system/default.nix

@@ -16,16 +16,16 @@ let
   cnix =
     shared
     ++ [
-      ./usr/bin/gaming.nix
+      ./opt/gaming.nix
-      ./usr/bin/android
+      ./opt/android
-      ./usr/bin/gimp
+      ./opt/gimp
-      ./usr/bin/inkscape
+      ./opt/inkscape
       ./srv/blueman
     ];
   toothpc =
     shared
     ++ [
-      ./usr/bin/gaming.nix
+      ./opt/gaming.nix
     ];
 in {
   inherit shared adampad cnix toothpc;