Merge branch 'waybar-here-i-come' of github.com:anotherhadi/nixy into waybar-here-i-come

hosts/laptop/configuration.nix

@@ -13,7 +13,7 @@
     ../../nixos/utils.nix
     ../../nixos/hyprland.nix
     ../../nixos/usbguard.nix
-    ../../home/programs/helium/system.nix # I hate browser's configuration..
+    ../../home/programs/gui/helium/system.nix # I hate browser's configuration..
 
     ../../nixos/omen.nix # CHANGEME: For my laptop only, remove this (OMEN 16)
 

hosts/laptop/home.nix

@@ -1,25 +1,35 @@
-{config, ...}: {
+{
+  config,
+  inputs,
+  ...
+}: {
   imports = [
     # Programs
-    ../../home/programs/helium
-    ../../home/programs/proton
-    ../../home/programs/proton/auto-start-vpn.nix
-    ../../home/programs/ghostty
-    ../../home/programs/nvf
-    ../../home/programs/shell
-    ../../home/programs/git
-    ../../home/programs/git/lazygit.nix
-    ../../home/programs/git/signing.nix # CHANGEME: Change the key or remove this file
-    ../../home/programs/thunar
-    ../../home/programs/nixy
-    ../../home/programs/nix-utils
-    ../../home/programs/spotatui
-    ../../home/programs/yazi
 
-    ../../home/programs/group/basic-apps.nix
+    ## GUI
+    ../../home/programs/gui/proton
+    ../../home/programs/gui/proton/auto-start-vpn.nix
+    ../../home/programs/gui/helium
+    ../../home/programs/gui/thunar
+    ../../home/programs/gui/pkgs.nix
+
+    ## TUI
+    inputs.nvf-config.homeManagerModules.default
+    ../../home/programs/tui/ghostty
+    ../../home/programs/tui/ilovetui
+    ../../home/programs/tui/shell
+    ../../home/programs/tui/git
+    ../../home/programs/tui/git/lazygit.nix
+    ../../home/programs/tui/git/signing.nix # CHANGEME: Change the key or remove this file
+    ../../home/programs/tui/nixy
+    ../../home/programs/tui/nix-utils
+    ../../home/programs/tui/spotatui
+    ../../home/programs/tui/yazi
+    ../../home/programs/tui/pkgs.nix
+
+    ## GROUPS
     ../../home/programs/group/cybersecurity.nix
     ../../home/programs/group/dev.nix
-    ../../home/programs/group/misc.nix
 
     # System (Desktop environment like stuff)
     ../../home/system/hyprlock
@@ -28,7 +38,10 @@
     ../../home/system/swaync
     ../../home/system/tofi
     ../../home/system/mime
+    ../../home/system/termfilechooser
     ../../home/system/udiskie
+    ../../home/system/clipboard
+    ../../home/system/hypridle
 
     ./variables.nix # Mostly user-specific configuration
     ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets

hosts/laptop/secrets/default.nix

@@ -52,7 +52,6 @@ in {
             - *work
   '';
 
-  systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
   home.packages = with pkgs; [
     sops
     age

hosts/laptop/variables.nix

@@ -26,6 +26,8 @@
 
     autoUpgrade = false;
     autoGarbageCollector = true;
+
+    hasBattery = true;
   };
 
   # DON'T TOUCH THIS