Finally find a better name for these folders

home/home.nix

@@ -3,11 +3,11 @@
 {pkgs, inputs, outputs, ...}: {
   imports = [
     # Terminal apps
-    ./tuiapps/zsh.nix
-    ./tuiapps/fastfetch.nix
-    ./tuiapps/neovim.nix
-    ./tuiapps/ranger.nix
-    ./tuiapps/tmux.nix
+    ./utils/zsh.nix
+    ./utils/fastfetch.nix
+    ./utils/neovim.nix
+    ./utils/ranger.nix
+    ./utils/tmux.nix
 
     # Services
     ./services/reloadunits.nix

home/jimbo_desktop.nix

@@ -3,23 +3,23 @@
     # Common modules
     ./home.nix
     ./users/jimbo.nix
-    ./tuiapps/git.nix
+    ./utils/git.nix
 
     # GUI Apps
     ./misc/guifiles.nix
     ./sway/sway.nix
     ./sway/swaylock.nix
-    ./guiapps/gtk.nix
-    ./guiapps/foot.nix
-    ./guiapps/librewolf.nix
-    ./guiapps/mangohud.nix
-    ./guiapps/mpv.nix
-    ./guiapps/obs.nix
-    ./guiapps/pcmanfm-qt.nix
-    ./guiapps/rofi.nix
-    ./guiapps/swappy.nix
-    ./guiapps/easyeffects.nix
-    ./tuiapps/ncmpcpp.nix
+    ./programs/gtk.nix
+    ./programs/foot.nix
+    ./programs/librewolf.nix
+    ./programs/mangohud.nix
+    ./programs/mpv.nix
+    ./programs/obs.nix
+    ./programs/pcmanfm-qt.nix
+    ./programs/rofi.nix
+    ./programs/swappy.nix
+    ./programs/easyeffects.nix
+    ./utils/ncmpcpp.nix
 
     # Misc apps and tools
     ./misc/useful.nix

home/jimbo_lenovo.nix

@@ -3,23 +3,23 @@
     # Common modules
     ./home.nix
     ./users/jimbo.nix
-    ./tuiapps/git.nix
+    ./utils/git.nix
 
     # GUI Apps
     ./misc/guifiles.nix
     ./sway/sway.nix
     ./sway/swaylock.nix
-    ./guiapps/gtk.nix
-    ./guiapps/foot.nix
-    ./guiapps/librewolf.nix
-    ./guiapps/mangohud.nix
-    ./guiapps/mpv.nix
-    ./guiapps/obs.nix
-    ./guiapps/pcmanfm-qt.nix
-    ./guiapps/rofi.nix
-    ./guiapps/swappy.nix
-    ./guiapps/easyeffects.nix
-    ./tuiapps/ncmpcpp.nix
+    ./programs/gtk.nix
+    ./programs/foot.nix
+    ./programs/librewolf.nix
+    ./programs/mangohud.nix
+    ./programs/mpv.nix
+    ./programs/obs.nix
+    ./programs/pcmanfm-qt.nix
+    ./programs/rofi.nix
+    ./programs/swappy.nix
+    ./programs/easyeffects.nix
+    ./utils/ncmpcpp.nix
 
     # Misc apps and tools
     ./misc/useful.nix

home/jimbo_pinebook.nix

@@ -3,22 +3,22 @@
     # Common modules
     ./home.nix
     ./users/jimbo.nix
-    ./tuiapps/git.nix
+    ./utils/git.nix
 
     # GUI Apps
     ./misc/guifiles.nix
     ./sway/sway.nix
     ./sway/swaylock.nix
-    ./guiapps/gtk.nix
-    ./guiapps/foot.nix
-    ./guiapps/librewolf.nix
-    ./guiapps/mangohud.nix
-    ./guiapps/mpv.nix
-    ./guiapps/pcmanfm-qt.nix
-    ./guiapps/rofi.nix
-    ./guiapps/swappy.nix
-    ./guiapps/easyeffects.nix
-    ./tuiapps/ncmpcpp.nix
+    ./programs/gtk.nix
+    ./programs/foot.nix
+    ./programs/librewolf.nix
+    ./programs/mangohud.nix
+    ./programs/mpv.nix
+    ./programs/pcmanfm-qt.nix
+    ./programs/rofi.nix
+    ./programs/swappy.nix
+    ./programs/easyeffects.nix
+    ./utils/ncmpcpp.nix
 
     # Misc apps and tools
     ./misc/useful.nix

home/jimbo_server.nix

@@ -3,6 +3,6 @@
     # Common modules
     ./home.nix
     ./users/jimbo.nix
-    ./tuiapps/git.nix
+    ./utils/git.nix
   ];
 }