refactor: removing needless module complexity

flake.lock

@@ -592,11 +592,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1729905757,
-        "narHash": "sha256-4KlQKI/SqiF25pMr7tLZbqHXFdEeoT1KZF+b/6Af7yw=",
+        "lastModified": 1729957831,
+        "narHash": "sha256-xI4wC3/KqK+GhLVZWDzSXncLqO6vF0DXYvykXdtnCdE=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "0b29caf9ab86518ff474eed5e7d19c12f96ebbd0",
+        "rev": "c356e425008cba8bd0c87487a2c79b9be4eda2aa",
         "type": "github"
       },
       "original": {
@@ -700,11 +700,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729890296,
-        "narHash": "sha256-7xSf7awy/cvYPlky8Bkh69N6eZUpR8PYMH52wJPznQg=",
+        "lastModified": 1729967244,
+        "narHash": "sha256-AfgcduDOjfBCpe4vzjhiuIiRRhmi03sLaN0fX+JrZ3E=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "ae3bb0fd43d6129520ec4b1f022976e7b929dcde",
+        "rev": "29dd33d6a46242ec49f0145946fd7e05d6970e0d",
         "type": "github"
       },
       "original": {
@@ -747,6 +747,35 @@
         "type": "github"
       }
     },
+    "hyprsysteminfo": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729184813,
+        "narHash": "sha256-ARrsIQPFCHWjVl9Sxh8tedIoEsvnV4nORaDmYCyK+kk=",
+        "owner": "hyprwm",
+        "repo": "hyprsysteminfo",
+        "rev": "8b271e2ba39a5a9299e4e7bb60245a71704f5a89",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprsysteminfo",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -1149,11 +1178,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1729953915,
-        "narHash": "sha256-h/YwhMlIfFJyNQmbNgkwVyBCF6j0zQAyGaKJM+451VY=",
+        "lastModified": 1729971220,
+        "narHash": "sha256-m8FayBFkRGljYTZDWygQdDqoD7ScUSm1iPi6iAvfSw0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "3070deb34475f92fff996245f31a888ca70cfc4f",
+        "rev": "e51ca268e4ffb736cc9db0ef2c8bf36ef026ffdc",
         "type": "github"
       },
       "original": {
@@ -1230,6 +1259,7 @@
         "hyprland-contrib": "hyprland-contrib",
         "hyprlock": "hyprlock",
         "hyprpaper": "hyprpaper",
+        "hyprsysteminfo": "hyprsysteminfo",
         "lanzaboote": "lanzaboote",
         "microfetch": "microfetch",
         "nix-gaming": "nix-gaming",

flake.nix

@@ -89,6 +89,15 @@
       };
     };
 
+    hyprsysteminfo = {
+      url = "github:hyprwm/hyprsysteminfo";
+      inputs = {
+        hyprutils.follows = "hyprland/hyprutils";
+        nixpkgs.follows = "hyprland/nixpkgs";
+        systems.follows = "hyprland/systems";
+      };
+    };
+
     # Chaotic
     chaotic.url = "https://flakehub.com/f/chaotic-cx/nyx/*.tar.gz";
 

hosts/cnix/modules.nix

@@ -1,6 +1,12 @@
 {
   nixos = {
     boot = {
+      kernel = {
+        extraBlacklistedModules = [];
+        extraKernelParams = [];
+        hardware = "amd";
+        variant = "cachyos";
+      };
       loader = {
         default = {
           enable = false;
@@ -9,45 +15,11 @@
           enable = true;
         };
       };
-      kernel = {
-        variant = "cachyos";
-        hardware = "amd";
-        extraKernelParams = [];
-        extraBlacklistedModules = [];
-      };
-    };
-    gaming = {
-      steam = {
-        enable = true;
-      };
-      gamescope = {
-        enable = true;
-      };
-      lutris = {
-        enable = true;
-      };
-      gamemode = {
-        enable = true;
-        optimizeGpu = {
-          enable = true;
-        };
-      };
-    };
-    gui = {
-      gnome = {
-        enable = false;
-      };
-      hyprland = {
-        enable = true;
-      };
     };
     hardware = {
       bluetooth = {
         enable = true;
       };
-      logitech = {
-        enable = true;
-      };
       graphics = {
         amd = {
           enable = true;
@@ -57,6 +29,9 @@
           enable = false;
         };
       };
+      logitech = {
+        enable = true;
+      };
       network = {
         enable = true;
         hostName = "cnix";
@@ -71,131 +46,49 @@
         };
       };
     };
-    studio = {
-      blender = {
-        enable = true;
-        hip = {
-          enable = true;
-        };
-      };
-      gimp = {
-        enable = true;
-      };
-      inkscape = {
-        enable = true;
-      };
-      beekeeper = {
-        enable = false;
-      };
-      mysql-workbench = {
-        enable = false;
-      };
-    };
-    services = {
-      network = {
-        blueman = {
-          enable = true;
-        };
-        mullvad = {
-          enable = true;
-        };
-        samba = {
-          enable = false;
-        };
-        openssh = {
-          enable = true;
-        };
-      };
-      security = {
-        agenix = {
-          enable = true;
-          cnix = {
-            enable = true;
-          };
-        };
-        gnome-keyring = {
-          enable = false;
-        };
-      };
-      session = {
-        dbus = {
-          enable = true;
-        };
-        dconf = {
-          enable = true;
-        };
-      };
-      system = {
-        fwupd = {
-          enable = true;
-        };
-        greetd = {
-          enable = true;
-          gnomeKeyring = {
-            enable = false;
-          };
-          autologin = {
-            enable = false;
-            user = "cnst";
-          };
-        };
-        gvfs = {
-          enable = true;
-        };
-        locate = {
-          enable = true;
-        };
-        nix-ld = {
-          enable = false;
-        };
-        pcscd = {
-          enable = true;
-        };
-        pipewire = {
-          enable = true;
-        };
-        powerd = {
-          enable = true;
-        };
-        udisks = {
-          enable = true;
-        };
-        zram = {
-          enable = true;
-        };
-        kanata = {
-          enable = true;
-        };
-      };
-    };
-    system = {
-      devpkgs = {
-        enable = true;
-      };
-      fonts = {
-        enable = true;
-      };
-      locale = {
-        enable = true;
-        timeZone = "Europe/Stockholm";
-        defaultLocale = "en_US.UTF-8";
-        extraLocale = "sv_SE.UTF-8";
-      };
-      xdg = {
-        enable = true;
-        xdgOpenUsePortal = true;
-      };
-    };
-    utils = {
+    programs = {
       android = {
         enable = true;
       };
       anyrun = {
         enable = false;
       };
+      beekeeper = {
+        enable = false;
+      };
+      blender = {
+        enable = true;
+        hip = {
+          enable = true;
+        };
+      };
       corectrl = {
         enable = true;
       };
+      gamemode = {
+        enable = true;
+        optimizeGpu = {
+          enable = true;
+        };
+      };
+      gamescope = {
+        enable = true;
+      };
+      gimp = {
+        enable = true;
+      };
+      gnome = {
+        enable = false;
+      };
+      hyprland = {
+        enable = true;
+      };
+      inkscape = {
+        enable = true;
+      };
+      lutris = {
+        enable = true;
+      };
       microfetch = {
         enable = true;
       };
@@ -205,6 +98,9 @@
           enable = true;
         };
       };
+      mysql-workbench = {
+        enable = false;
+      };
       nh = {
         enable = true;
         clean = {
@@ -218,6 +114,9 @@
       obsidian = {
         enable = true;
       };
+      steam = {
+        enable = true;
+      };
       yubikey = {
         enable = true;
       };
@@ -225,5 +124,92 @@
         enable = true;
       };
     };
+    services = {
+      agenix = {
+        enable = true;
+        cnix = {
+          enable = true;
+        };
+      };
+      blueman = {
+        enable = true;
+      };
+      dbus = {
+        enable = true;
+      };
+      dconf = {
+        enable = true;
+      };
+      fwupd = {
+        enable = true;
+      };
+      gnome-keyring = {
+        enable = false;
+      };
+      greetd = {
+        autologin = {
+          enable = false;
+          user = "cnst";
+        };
+        enable = true;
+        gnomeKeyring = {
+          enable = false;
+        };
+      };
+      gvfs = {
+        enable = true;
+      };
+      kanata = {
+        enable = true;
+      };
+      locate = {
+        enable = true;
+      };
+      mullvad = {
+        enable = true;
+      };
+      nix-ld = {
+        enable = false;
+      };
+      openssh = {
+        enable = true;
+      };
+      pcscd = {
+        enable = true;
+      };
+      pipewire = {
+        enable = true;
+      };
+      powerd = {
+        enable = true;
+      };
+      samba = {
+        enable = false;
+      };
+      udisks = {
+        enable = true;
+      };
+      zram = {
+        enable = true;
+      };
+    };
+    system = {
+      devpkgs = {
+        enable = true;
+      };
+      fonts = {
+        enable = true;
+      };
+      locale = {
+        defaultLocale = "en_US.UTF-8";
+        enable = true;
+        extraLocale = "sv_SE.UTF-8";
+        timeZone = "Europe/Stockholm";
+      };
+      xdg = {
+        enable = true;
+        xdgOpenUsePortal = true;
+      };
+    };
   };
 }

hosts/cnixpad/modules.nix

@@ -1,6 +1,12 @@
-{pkgs, ...}: {
+{
   nixos = {
     boot = {
+      kernel = {
+        extraBlacklistedModules = [];
+        extraKernelParams = [];
+        hardware = "amd";
+        variant = "stable";
+      };
       loader = {
         default = {
           enable = true;
@@ -9,28 +15,11 @@
           enable = false;
         };
       };
-      kernel = {
-        variant = "stable";
-        hardware = "amd";
-        extraKernelParams = [];
-        extraBlacklistedModules = [];
-      };
-    };
-    gui = {
-      gnome = {
-        enable = false;
-      };
-      hyprland = {
-        enable = true;
-      };
     };
     hardware = {
       bluetooth = {
         enable = true;
       };
-      logitech = {
-        enable = false;
-      };
       graphics = {
         amd = {
           enable = true;
@@ -40,6 +29,9 @@
           enable = false;
         };
       };
+      logitech = {
+        enable = true;
+      };
       network = {
         enable = true;
         hostName = "cnixpad";
@@ -54,126 +46,49 @@
         };
       };
     };
-    studio = {
-      blender = {
-        enable = false;
-        hip = {
-          enable = false;
-        };
-      };
-      gimp = {
-        enable = false;
-      };
-      inkscape = {
-        enable = false;
-      };
-      beekeeper = {
-        enable = false;
-      };
-      mysql-workbench = {
-        enable = false;
-      };
-    };
-    services = {
-      network = {
-        blueman = {
-          enable = true;
-        };
-        mullvad = {
-          enable = true;
-        };
-        samba = {
-          enable = false;
-        };
-        openssh = {
-          enable = true;
-        };
-      };
-      security = {
-        agenix = {
-          enable = true;
-          cnixpad = {
-            enable = true;
-          };
-        };
-        gnome-keyring = {
-          enable = true;
-        };
-      };
-      session = {
-        dbus = {
-          enable = true;
-        };
-        dconf = {
-          enable = true;
-        };
-      };
-      system = {
-        fwupd = {
-          enable = true;
-        };
-        greetd = {
-          enable = true;
-          gnomeKeyring.enable = false;
-          autologin = {
-            enable = false;
-            user = "cnst";
-          };
-        };
-        gvfs = {
-          enable = true;
-        };
-        locate = {
-          enable = true;
-        };
-        nix-ld = {
-          enable = false;
-        };
-        pipewire = {
-          enable = true;
-        };
-        powerd = {
-          enable = true;
-        };
-        udisks = {
-          enable = true;
-        };
-        zram = {
-          enable = false;
-        };
-      };
-    };
-    system = {
-      devpkgs = {
-        enable = true;
-      };
-      fonts = {
-        enable = true;
-      };
-      locale = {
-        enable = true;
-        timeZone = "Europe/Stockholm";
-        defaultLocale = "en_US.UTF-8";
-        extraLocale = "sv_SE.UTF-8";
-      };
-      xdg = {
-        enable = true;
-        xdgOpenUsePortal = true;
-      };
-    };
-    utils = {
+    programs = {
       android = {
         enable = true;
       };
       anyrun = {
         enable = false;
       };
-      brightnessctl = {
-        enable = true;
+      beekeeper = {
+        enable = false;
+      };
+      blender = {
+        enable = false;
+        hip = {
+          enable = false;
+        };
       };
       corectrl = {
         enable = false;
       };
+      gamemode = {
+        enable = false;
+        optimizeGpu = {
+          enable = false;
+        };
+      };
+      gamescope = {
+        enable = false;
+      };
+      gimp = {
+        enable = false;
+      };
+      gnome = {
+        enable = false;
+      };
+      hyprland = {
+        enable = true;
+      };
+      inkscape = {
+        enable = false;
+      };
+      lutris = {
+        enable = false;
+      };
       microfetch = {
         enable = true;
       };
@@ -183,6 +98,9 @@
           enable = false;
         };
       };
+      mysql-workbench = {
+        enable = false;
+      };
       nh = {
         enable = true;
         clean = {
@@ -196,9 +114,102 @@
       obsidian = {
         enable = true;
       };
+      steam = {
+        enable = false;
+      };
+      yubikey = {
+        enable = true;
+      };
       zsh = {
         enable = true;
       };
     };
+    services = {
+      agenix = {
+        enable = true;
+        cnixpad = {
+          enable = true;
+        };
+      };
+      blueman = {
+        enable = true;
+      };
+      dbus = {
+        enable = true;
+      };
+      dconf = {
+        enable = true;
+      };
+      fwupd = {
+        enable = true;
+      };
+      gnome-keyring = {
+        enable = false;
+      };
+      greetd = {
+        autologin = {
+          enable = false;
+          user = "cnst";
+        };
+        enable = true;
+        gnomeKeyring = {
+          enable = false;
+        };
+      };
+      gvfs = {
+        enable = true;
+      };
+      kanata = {
+        enable = false;
+      };
+      locate = {
+        enable = true;
+      };
+      mullvad = {
+        enable = true;
+      };
+      nix-ld = {
+        enable = false;
+      };
+      openssh = {
+        enable = true;
+      };
+      pcscd = {
+        enable = true;
+      };
+      pipewire = {
+        enable = true;
+      };
+      powerd = {
+        enable = true;
+      };
+      samba = {
+        enable = false;
+      };
+      udisks = {
+        enable = true;
+      };
+      zram = {
+        enable = false;
+      };
+    };
+    system = {
+      devpkgs = {
+        enable = true;
+      };
+      fonts = {
+        enable = true;
+      };
+      locale = {
+        defaultLocale = "en_US.UTF-8";
+        enable = true;
+        extraLocale = "sv_SE.UTF-8";
+        timeZone = "Europe/Stockholm";
+      };
+      xdg = {
+        enable = true;
+        xdgOpenUsePortal = true;
+      };
+    };
   };
 }

hosts/toothpc/modules.nix

@@ -1,6 +1,12 @@
-{pkgs, ...}: {
+{
   nixos = {
     boot = {
+      kernel = {
+        extraBlacklistedModules = [];
+        extraKernelParams = [];
+        hardware = "nvidia";
+        variant = "stable";
+      };
       loader = {
         default = {
           enable = false;
@@ -9,54 +15,23 @@
           enable = true;
         };
       };
-      kernel = {
-        variant = "stable";
-        hardware = "nvidia";
-        extraKernelParams = [];
-        extraBlacklistedModules = [];
-      };
-    };
-    gaming = {
-      steam = {
-        enable = true;
-      };
-      gamescope = {
-        enable = true;
-      };
-      lutris = {
-        enable = true;
-      };
-      gamemode = {
-        enable = true;
-        optimizeGpu = {
-          enable = false;
-        };
-      };
-    };
-    gui = {
-      gnome = {
-        enable = false;
-      };
-      hyprland = {
-        enable = true;
-      };
     };
     hardware = {
       bluetooth = {
         enable = false;
       };
-      logitech = {
-        enable = true;
-      };
       graphics = {
         amd = {
           enable = false;
         };
         nvidia = {
           enable = true;
-          package = "latest"; # set to beta/latest/stable/production depending on your needs
+          package = "latest";
         };
       };
+      logitech = {
+        enable = true;
+      };
       network = {
         enable = true;
         hostName = "toothpc";
@@ -71,127 +46,47 @@
         };
       };
     };
-    studio = {
+    programs = {
+      android = {
+        enable = true;
+      };
+      anyrun = {
+        enable = false;
+      };
+      beekeeper = {
+        enable = true;
+      };
       blender = {
         enable = false;
         hip = {
           enable = false;
         };
       };
+      corectrl = {
+        enable = false;
+      };
+      gamemode = {
+        enable = true;
+        optimizeGpu = {
+          enable = false;
+        };
+      };
+      gamescope = {
+        enable = false;
+      };
       gimp = {
+        enable = false;
+      };
+      gnome = {
+        enable = false;
+      };
+      hyprland = {
         enable = true;
       };
       inkscape = {
-        enable = true;
-      };
-      beekeeper = {
-        enable = true;
-      };
-      mysql-workbench = {
-        enable = true;
-      };
-    };
-    services = {
-      network = {
-        blueman = {
-          enable = false;
-        };
-        mullvad = {
-          enable = true;
-        };
-        samba = {
-          enable = false;
-        };
-        openssh = {
-          enable = true;
-        };
-      };
-      security = {
-        agenix = {
-          enable = true;
-          toothpc = {
-            enable = true;
-          };
-        };
-        gnome-keyring = {
-          enable = true;
-        };
-      };
-      session = {
-        dbus = {
-          enable = true;
-        };
-        dconf = {
-          enable = true;
-        };
-        xserver = {
-          videoDrivers = ["nvidia"];
-          xkbLayout = "se";
-        };
-      };
-      system = {
-        fwupd = {
-          enable = true;
-        };
-        greetd = {
-          enable = true;
-          gnomeKeyring = {
-            enable = false;
-          };
-          autologin = {
-            enable = false;
-            user = "toothpick";
-          };
-        };
-        gvfs = {
-          enable = true;
-        };
-        locate = {
-          enable = true;
-        };
-        nix-ld = {
-          enable = false;
-        };
-        pipewire = {
-          enable = true;
-        };
-        powerd = {
-          enable = true;
-        };
-        udisks = {
-          enable = true;
-        };
-        zram = {
-          enable = true;
-        };
-      };
-    };
-    system = {
-      devpkgs = {
-        enable = true;
-      };
-      fonts = {
-        enable = true;
-      };
-      locale = {
-        enable = true;
-        timeZone = "Europe/Stockholm";
-        defaultLocale = "en_US.UTF-8";
-        extraLocale = "sv_SE.UTF-8";
-      };
-      xdg = {
-        enable = true;
-        xdgOpenUsePortal = true;
-      };
-    };
-    utils = {
-      android = {
         enable = false;
       };
-      anyrun = {
-        enable = true;
-      };
-      corectrl = {
+      lutris = {
         enable = false;
       };
       microfetch = {
@@ -203,6 +98,9 @@
           enable = true;
         };
       };
+      mysql-workbench = {
+        enable = true;
+      };
       nh = {
         enable = true;
         clean = {
@@ -213,15 +111,109 @@
       npm = {
         enable = true;
       };
-      yubikey = {
-        enable = false;
-      };
       obsidian = {
-        enable = false;
+        enable = true;
+      };
+      steam = {
+        enable = true;
+      };
+      yubikey = {
+        enable = true;
       };
       zsh = {
         enable = true;
       };
     };
+    services = {
+      agenix = {
+        enable = true;
+        toothpc = {
+          enable = true;
+        };
+      };
+      blueman = {
+        enable = false;
+      };
+      dbus = {
+        enable = true;
+      };
+      dconf = {
+        enable = true;
+      };
+      fwupd = {
+        enable = true;
+      };
+      gnome-keyring = {
+        enable = false;
+      };
+      greetd = {
+        autologin = {
+          enable = false;
+          user = "toothpick";
+        };
+        enable = true;
+        gnomeKeyring = {
+          enable = false;
+        };
+      };
+      gvfs = {
+        enable = true;
+      };
+      kanata = {
+        enable = false;
+      };
+      locate = {
+        enable = true;
+      };
+      mullvad = {
+        enable = true;
+      };
+      nix-ld = {
+        enable = false;
+      };
+      openssh = {
+        enable = true;
+      };
+      pcscd = {
+        enable = true;
+      };
+      pipewire = {
+        enable = true;
+      };
+      powerd = {
+        enable = true;
+      };
+      samba = {
+        enable = false;
+      };
+      udisks = {
+        enable = true;
+      };
+      xserver = {
+        videoDrivers = ["nvidia"];
+        xkbLayout = "se";
+      };
+      zram = {
+        enable = true;
+      };
+    };
+    system = {
+      devpkgs = {
+        enable = true;
+      };
+      fonts = {
+        enable = true;
+      };
+      locale = {
+        defaultLocale = "en_US.UTF-8";
+        enable = true;
+        extraLocale = "sv_SE.UTF-8";
+        timeZone = "Europe/Stockholm";
+      };
+      xdg = {
+        enable = true;
+        xdgOpenUsePortal = true;
+      };
+    };
   };
 }

modules/default.nix

@@ -2,69 +2,52 @@
   flake.nixosModules = {
     home = {
       imports = [
-        ./home/browsers/chromium
-        ./home/browsers/firefox
-        ./home/browsers/zen
+        ./home/programs/alacritty
+        ./home/programs/anyrun
+        ./home/programs/bash
+        ./home/programs/chromium
+        ./home/programs/discord
+        ./home/programs/eza
+        ./home/programs/firefox
+        ./home/programs/foot
+        ./home/programs/helix
+        ./home/programs/hyprland
+        ./home/programs/hyprlock
+        ./home/programs/jujutsu
+        ./home/programs/kitty
+        ./home/programs/misc
+        ./home/programs/mpv
+        ./home/programs/neovim
+        ./home/programs/rofi
+        ./home/programs/ssh
+        ./home/programs/tuirun
+        ./home/programs/vscode
+        ./home/programs/waybar
+        ./home/programs/wezterm
+        ./home/programs/yazi
+        ./home/programs/zathura
+        ./home/programs/zellij
+        ./home/programs/zen
+        ./home/programs/zsh
 
-        ./home/comm/discord
-
-        ./home/devtools/helix
-        ./home/devtools/neovim
-        ./home/devtools/vscode
-
-        # ./home/gaming/steam
-        # ./home/gaming/mangohud
-        # ./home/gaming/lutris
-
-        ./home/cli/alacritty
-        ./home/cli/bash
-        ./home/cli/foot
-        ./home/cli/jujutsu
-        ./home/cli/kitty
-        ./home/cli/wezterm
-        ./home/cli/zellij
-        ./home/cli/zsh
-
-        ./home/userd/blueman-applet
-        ./home/userd/copyq
-        ./home/userd/dconf
-        ./home/userd/gpg
-        ./home/userd/gtk
-        ./home/userd/mako
-        ./home/userd/polkit
-        ./home/userd/syncthing
-        ./home/userd/udiskie
-        ./home/userd/xdg
-
-        ./home/utils/anyrun
-        ./home/utils/eza
-        ./home/utils/misc
-        ./home/utils/mpv
-        ./home/utils/rofi
-        ./home/utils/ssh
-        ./home/utils/tuirun
-        ./home/utils/waybar
-        ./home/utils/yazi
-        ./home/utils/zathura
-
-        ./home/wm/hyprland
-        ./home/wm/utils/hypridle
-        ./home/wm/utils/hyprlock
-        ./home/wm/utils/hyprpaper
+        ./home/services/blueman-applet
+        ./home/services/copyq
+        ./home/services/dconf
+        ./home/services/gpg
+        ./home/services/gtk
+        ./home/services/hypridle
+        ./home/services/hyprpaper
+        ./home/services/mako
+        ./home/services/polkit
+        ./home/services/syncthing
+        ./home/services/udiskie
+        ./home/services/xdg
       ];
     };
     nixos = {
       imports = [
-        ./nixos/boot/loader
         ./nixos/boot/kernel
-
-        ./nixos/gaming/gamemode
-        ./nixos/gaming/gamescope
-        ./nixos/gaming/lutris
-        ./nixos/gaming/steam
-
-        ./nixos/gui/gnome
-        ./nixos/gui/hyprland
+        ./nixos/boot/loader
 
         ./nixos/hardware/bluetooth
         ./nixos/hardware/graphics/amd
@@ -72,52 +55,54 @@
         ./nixos/hardware/logitech
         ./nixos/hardware/network
 
-        ./nixos/studio/blender
-        ./nixos/studio/gimp
-        ./nixos/studio/inkscape
-        ./nixos/studio/beekeeper
-        ./nixos/studio/mysql-workbench
+        ./nixos/programs/android
+        ./nixos/programs/anyrun
+        ./nixos/programs/beekeeper
+        ./nixos/programs/blender
+        ./nixos/programs/brightnessctl
+        ./nixos/programs/corectrl
+        ./nixos/programs/gamemode
+        ./nixos/programs/gamescope
+        ./nixos/programs/gimp
+        ./nixos/programs/gnome
+        ./nixos/programs/hyprland
+        ./nixos/programs/inkscape
+        ./nixos/programs/lutris
+        ./nixos/programs/microfetch
+        ./nixos/programs/misc
+        ./nixos/programs/mysql-workbench
+        ./nixos/programs/nh
+        ./nixos/programs/npm
+        ./nixos/programs/obsidian
+        ./nixos/programs/steam
+        ./nixos/programs/yubikey
+        ./nixos/programs/zsh
 
-        ./nixos/services/network/blueman
-        ./nixos/services/network/mullvad
-        ./nixos/services/network/samba
-        ./nixos/services/network/openssh
-
-        ./nixos/services/security/agenix
-        ./nixos/services/security/gnome-keyring
-
-        ./nixos/services/session/dbus
-        ./nixos/services/session/dconf
-        ./nixos/services/session/xserver
-
-        ./nixos/services/system/fwupd
-        ./nixos/services/system/greetd
-        ./nixos/services/system/gvfs
-        ./nixos/services/system/locate
-        ./nixos/services/system/nix-ld
-        ./nixos/services/system/pcscd
-        ./nixos/services/system/pipewire
-        ./nixos/services/system/powerd
-        ./nixos/services/system/udisks
-        ./nixos/services/system/zram
-        ./nixos/services/system/kanata
+        ./nixos/services/agenix
+        ./nixos/services/blueman
+        ./nixos/services/dbus
+        ./nixos/services/dconf
+        ./nixos/services/fwupd
+        ./nixos/services/gnome-keyring
+        ./nixos/services/greetd
+        ./nixos/services/gvfs
+        ./nixos/services/kanata
+        ./nixos/services/locate
+        ./nixos/services/mullvad
+        ./nixos/services/nix-ld
+        ./nixos/services/openssh
+        ./nixos/services/pcscd
+        ./nixos/services/pipewire
+        ./nixos/services/powerd
+        ./nixos/services/samba
+        ./nixos/services/udisks
+        ./nixos/services/xserver
+        ./nixos/services/zram
 
         ./nixos/system/devpkgs
         ./nixos/system/fonts
         ./nixos/system/locale
         ./nixos/system/xdg
-
-        ./nixos/utils/android
-        ./nixos/utils/anyrun
-        ./nixos/utils/brightnessctl
-        ./nixos/utils/corectrl
-        ./nixos/utils/microfetch
-        ./nixos/utils/misc
-        ./nixos/utils/nh
-        ./nixos/utils/npm
-        ./nixos/utils/obsidian
-        ./nixos/utils/yubikey
-        ./nixos/utils/zsh
       ];
     };
     options = {

modules/home/programs/alacritty/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.cli.alacritty;
+  cfg = config.home.programs.alacritty;
 in {
   options = {
-    home.cli.alacritty.enable = mkEnableOption "Enables firefox";
+    home.programs.alacritty.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.alacritty = {

modules/home/programs/anyrun/default.nix

@@ -5,13 +5,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.anyrun;
+  cfg = config.home.programs.anyrun;
 in {
   imports = [
     inputs.anyrun.homeManagerModules.default
   ];
   options = {
-    home.utils.anyrun.enable = mkEnableOption "Enables anyrun";
+    home.programs.anyrun.enable = mkEnableOption "Enables anyrun";
   };
   config = mkIf cfg.enable {
     programs.anyrun = {

modules/home/programs/bash/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.cli.bash;
+  cfg = config.home.programs.bash;
 in {
   options = {
-    home.cli.bash.enable = mkEnableOption "Enables bash";
+    home.programs.bash.enable = mkEnableOption "Enables bash";
   };
   config = mkIf cfg.enable {
     programs.bash = {

modules/home/programs/chromium/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.browsers.chromium;
+  cfg = config.home.programs.chromium;
 in {
   options = {
-    home.browsers.chromium.enable = mkEnableOption "Enables chromium";
+    home.programs.chromium.enable = mkEnableOption "Enables chromium";
   };
   config = mkIf cfg.enable {
     programs.chromium = {

modules/home/programs/discord/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.comm.discord;
+  cfg = config.home.programs.discord;
 in {
   options = {
-    home.comm.discord.enable = mkEnableOption "Enables discord";
+    home.programs.discord.enable = mkEnableOption "Enables discord";
   };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [vesktop];

modules/home/programs/eza/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.eza;
+  cfg = config.home.programs.eza;
 in {
   options = {
-    home.utils.eza.enable = mkEnableOption "Enables eza";
+    home.programs.eza.enable = mkEnableOption "Enables eza";
   };
   config = mkIf cfg.enable {
     programs.eza = {

modules/home/programs/firefox/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.browsers.firefox;
+  cfg = config.home.programs.firefox;
 in {
   imports = [
     inputs.nur.hmModules.nur
   ];
   options = {
-    home.browsers.firefox.enable = mkEnableOption "Enables firefox";
+    home.programs.firefox.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.firefox = {

modules/home/programs/foot/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.cli.foot;
+  cfg = config.home.programs.foot;
 in {
   options = {
-    home.cli.foot.enable = mkEnableOption "Enables foot cli";
+    home.programs.foot.enable = mkEnableOption "Enables foot programs";
   };
   config = mkIf cfg.enable {
     programs.foot = {
@@ -21,7 +21,7 @@ in {
         # term=foot (or xterm-256color if built with -Dterminfo=disabled)
         # login-shell=no
 
-        # app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode
+        # app-id=foot # globally set wayland app-id. Default values are "foot" and "footprogramsent" for desktop and server mode
         # title=foot
         # locked-title=no
 
@@ -136,7 +136,7 @@ in {
           # font=<primary font>
           # color=<foreground color>
           # hide-when-maximized=no
-          # double-click-to-maximize=yes
+          # double-programsck-to-maximize=yes
           # border-width=0
           # border-color=<csd.color>
           # button-width=26
@@ -155,21 +155,21 @@ in {
           # scrollback-down-line=none
           # scrollback-home=none
           # scrollback-end=none
-          # clipboard-copy=Control+Shift+c XF86Copy
-          # clipboard-paste=Control+Shift+v XF86Paste
+          # programspboard-copy=Control+Shift+c XF86Copy
+          # programspboard-paste=Control+Shift+v XF86Paste
           # primary-paste=Shift+Insert
           # search-start=Control+Shift+r
           # font-increase=Control+plus Control+equal Control+KP_Add
           # font-decrease=Control+minus Control+KP_Subtract
           # font-reset=Control+0 Control+KP_0
-          # spawn-cli=Control+Shift+n
+          # spawn-programs=Control+Shift+n
           # minimize=none
           # maximize=none
           # fullscreen=none
           # pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
           # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
           # pipe-selected=[xargs -r firefox] none
-          # pipe-command-output=[wl-copy] none # Copy last command's output to the clipboard
+          # pipe-command-output=[wl-copy] none # Copy last command's output to the programspboard
           # show-urls-launch=Control+Shift+o
           # show-urls-copy=none
           # show-urls-persistent=none
@@ -202,7 +202,7 @@ in {
           # extend-backward-to-word-boundary=Control+Shift+Left
           # extend-backward-to-next-whitespace=none
           # extend-line-up=Shift+Up
-          # clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
+          # programspboard-paste=Control+v Control+Shift+v Control+y XF86Paste
           # primary-paste=Shift+Insert
           # unicode-input=none
           # quit=none

modules/home/programs/helix/default.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.devtools.helix;
+  cfg = config.home.programs.helix;
 in {
   imports = [
     ./lang.nix
@@ -14,7 +14,7 @@ in {
   ];
 
   options = {
-    home.devtools.helix.enable = mkEnableOption "Enable helix";
+    home.programs.helix.enable = mkEnableOption "Enable helix";
   };
 
   config = mkIf cfg.enable {

modules/home/programs/hyprland/cnst/appearance.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.hyprland.toothpick.appearance;
+  cfg = config.home.programs.hyprland.cnst.appearance;
 in {
   options = {
-    home.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
+    home.programs.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprland/cnst/default.nix

@@ -7,22 +7,22 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkDefault;
-  cfg = config.home.wm.hyprland.cnst;
+  cfg = config.home.programs.hyprland.cnst;
 in {
   imports = [
-    "${umodPath}/wm/hyprland/cnst/appearance.nix"
-    "${umodPath}/wm/hyprland/cnst/inputs.nix"
-    "${umodPath}/wm/hyprland/cnst/keybinds.nix"
-    "${umodPath}/wm/hyprland/cnst/rules.nix"
-    "${umodPath}/wm/hyprland/cnst/startup.nix"
+    "${umodPath}/programs/hyprland/cnst/appearance.nix"
+    "${umodPath}/programs/hyprland/cnst/inputs.nix"
+    "${umodPath}/programs/hyprland/cnst/keybinds.nix"
+    "${umodPath}/programs/hyprland/cnst/rules.nix"
+    "${umodPath}/programs/hyprland/cnst/startup.nix"
   ];
 
   options = {
-    home.wm.hyprland.cnst.enable = mkEnableOption "Enable Hyprland";
+    home.programs.hyprland.cnst.enable = mkEnableOption "Enable Hyprland";
   };
 
   config = mkIf cfg.enable {
-    home.wm.hyprland.cnst = {
+    home.programs.hyprland.cnst = {
       appearance.enable = mkDefault cfg.enable;
       inputs.enable = mkDefault cfg.enable;
       keybinds.enable = mkDefault cfg.enable;

modules/home/programs/hyprland/cnst/inputs.nix

@@ -9,10 +9,10 @@
     if osConfig.networking.hostName == "cnixpad"
     then "ctrl:swapcaps"
     else "";
-  cfg = config.home.wm.hyprland.cnst.inputs;
+  cfg = config.home.programs.hyprland.cnst.inputs;
 in {
   options = {
-    home.wm.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
+    home.programs.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprland/cnst/keybinds.nix

@@ -14,10 +14,10 @@
     if osConfig.networking.hostName == "cnixpad"
     then "foot"
     else "alacritty";
-  cfg = config.home.wm.hyprland.cnst.keybinds;
+  cfg = config.home.programs.hyprland.cnst.keybinds;
 in {
   options = {
-    home.wm.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
+    home.programs.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprland/cnst/rules.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.hyprland.cnst.rules;
+  cfg = config.home.programs.hyprland.cnst.rules;
 in {
   options = {
-    home.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
+    home.programs.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
   };
 
   config = mkIf cfg.enable {

modules/home/programs/hyprland/cnst/startup.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.hyprland.cnst.startup;
+  cfg = config.home.programs.hyprland.cnst.startup;
 in {
   options = {
-    home.wm.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
+    home.programs.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprland/default.nix

@@ -0,0 +1,6 @@
+{umodPath, ...}: {
+  imports = [
+    "${umodPath}/programs/hyprland/cnst"
+    "${umodPath}/programs/hyprland/toothpick"
+  ];
+}

modules/home/programs/hyprland/toothpick/appearance.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.hyprland.cnst.appearance;
+  cfg = config.home.programs.hyprland.toothpick.appearance;
 in {
   options = {
-    home.wm.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
+    home.programs.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprland/toothpick/default.nix

@@ -7,22 +7,22 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkDefault;
-  cfg = config.home.wm.hyprland.toothpick;
+  cfg = config.home.programs.hyprland.toothpick;
 in {
   imports = [
-    "${umodPath}/wm/hyprland/toothpick/appearance.nix"
-    "${umodPath}/wm/hyprland/toothpick/inputs.nix"
-    "${umodPath}/wm/hyprland/toothpick/keybinds.nix"
-    "${umodPath}/wm/hyprland/toothpick/rules.nix"
-    "${umodPath}/wm/hyprland/toothpick/startup.nix"
+    "${umodPath}/programs/hyprland/toothpick/appearance.nix"
+    "${umodPath}/programs/hyprland/toothpick/inputs.nix"
+    "${umodPath}/programs/hyprland/toothpick/keybinds.nix"
+    "${umodPath}/programs/hyprland/toothpick/rules.nix"
+    "${umodPath}/programs/hyprland/toothpick/startup.nix"
   ];
 
   options = {
-    home.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland";
+    home.programs.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland";
   };
 
   config = mkIf cfg.enable {
-    home.wm.hyprland.toothpick = {
+    home.programs.hyprland.toothpick = {
       appearance.enable = mkDefault cfg.enable;
       inputs.enable = mkDefault cfg.enable;
       keybinds.enable = mkDefault cfg.enable;

modules/home/programs/hyprland/toothpick/inputs.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.hyprland.toothpick.inputs;
+  cfg = config.home.programs.hyprland.toothpick.inputs;
 in {
   options = {
-    home.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
+    home.programs.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprland/toothpick/keybinds.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.hyprland.toothpick.keybinds;
+  cfg = config.home.programs.hyprland.toothpick.keybinds;
 in {
   options = {
-    home.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
+    home.programs.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprland/toothpick/rules.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.hyprland.toothpick.rules;
+  cfg = config.home.programs.hyprland.toothpick.rules;
 in {
   options = {
-    home.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
+    home.programs.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprland/toothpick/startup.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.hyprland.toothpick.startup;
+  cfg = config.home.programs.hyprland.toothpick.startup;
 in {
   options = {
-    home.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
+    home.programs.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

modules/home/programs/hyprlock/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.wm.utils.hyprlock;
+  cfg = config.home.programs.hyprlock;
 
   hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
   # hyprlockPkg = pkgs.hyprlock;
 in {
   options = {
-    home.wm.utils.hyprlock.enable = mkEnableOption "Enables hyprlock";
+    home.programs.hyprlock.enable = mkEnableOption "Enables hyprlock";
   };
   config = mkIf cfg.enable {
     programs.hyprlock = {

modules/home/programs/jujutsu/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.cli.jujutsu;
+  cfg = config.home.programs.jujutsu;
 in {
   options = {
-    home.cli.jujutsu.enable = mkEnableOption "Enables jujutsu";
+    home.programs.jujutsu.enable = mkEnableOption "Enables jujutsu";
   };
   config = mkIf cfg.enable {
     programs.jujutsu = {

modules/home/programs/kitty/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.cli.kitty;
+  cfg = config.home.programs.kitty;
 in {
   options = {
-    home.cli.kitty.enable = mkEnableOption "Enables kitty cli";
+    home.programs.kitty.enable = mkEnableOption "Enables kitty programs";
   };
   config = mkIf cfg.enable {
     programs.kitty = {
@@ -22,7 +22,7 @@ in {
         bold_italic_font = "auto";
         font_size = "11.0";
         cursor_blink_interval = 0;
-        copy_on_select = "clipboard";
+        copy_on_select = "programspboard";
         background_opacity = "0.95";
         background_blur = "32";
         window_padding_width = 3;
@@ -47,8 +47,8 @@ in {
       extraConfig = ''
         kitty_mod shift+ctrl
         map kitty_mod+q close_tab
-        map ctrl+shift+c copy_to_clipboard
-        map ctrl+shift+v paste_from_clipboard
+        map ctrl+shift+c copy_to_programspboard
+        map ctrl+shift+v paste_from_programspboard
         tab_separator ""
         tab_title_template        "{fmt.fg._504945}{fmt.bg.default}▓{fmt.fg._282828}{fmt.bg.default}{index}{fmt.fg._282828}{fmt.bg._504945} {title[:15] + (title[15:] and '…')} {fmt.fg._504945}{fmt.bg.default}▓ "
         active_tab_title_template "{fmt.fg._282828}{fmt.bg.default}▓{fmt.fg._A89984}{fmt.bg._282828}{fmt.fg._A89984}{fmt.bg._282828} {title[:40] + (title[40:] and '…')} {fmt.fg._282828}{fmt.bg.default}▓ "

modules/home/programs/lutris/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.gaming.lutris;
+  cfg = config.home.programs.lutris;
 in {
   options = {
-    home.gaming.lutris.enable = mkEnableOption "Enables lutris";
+    home.programs.lutris.enable = mkEnableOption "Enables lutris";
   };
   config = mkIf cfg.enable {
     home.packages = [

modules/home/programs/mangohud/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.gaming.mangohud;
+  cfg = config.home.programs.mangohud;
 in {
   options = {
-    home.gaming.mangohud.enable = mkEnableOption "Enables mangohud";
+    home.programs.mangohud.enable = mkEnableOption "Enables mangohud";
   };
   config = mkIf cfg.enable {
     programs.mangohud = {

modules/home/programs/misc/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.misc;
+  cfg = config.home.programs.misc;
 in {
   options = {
-    home.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps";
+    home.programs.misc.enable = mkEnableOption "Enables miscellaneous utility apps";
   };
   config = mkIf cfg.enable {
     programs = {

modules/home/programs/mpv/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.mpv;
+  cfg = config.home.programs.mpv;
 in {
   options = {
-    home.utils.mpv.enable = mkEnableOption "Enables mpv";
+    home.programs.mpv.enable = mkEnableOption "Enables mpv";
   };
   config = mkIf cfg.enable {
     programs.mpv = {

modules/home/programs/neovim/default.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.devtools.neovim;
+  cfg = config.home.programs.neovim;
 in {
   imports = [
     ./plugins
@@ -15,7 +15,7 @@ in {
   ];
 
   options = {
-    home.devtools.neovim.enable = mkEnableOption "Enable neovim";
+    home.programs.neovim.enable = mkEnableOption "Enable neovim";
   };
 
   config = mkIf cfg.enable {

modules/home/programs/nixvim/default.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.devtools.nixvim;
+  cfg = config.home.programs.nixvim;
 in {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
@@ -18,7 +18,7 @@ in {
   ];
 
   options = {
-    home.devtools.nixvim.enable = mkEnableOption "Enable nixvim";
+    home.programs.nixvim.enable = mkEnableOption "Enable nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/programs/rofi/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.rofi;
+  cfg = config.home.programs.rofi;
 in {
   options = {
-    home.utils.rofi.enable = mkEnableOption "Enables firefox";
+    home.programs.rofi.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.rofi = {

modules/home/programs/ssh/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.ssh;
+  cfg = config.home.programs.ssh;
 in {
   options = {
-    home.utils.ssh.enable = mkEnableOption "Enables ssh";
+    home.programs.ssh.enable = mkEnableOption "Enables ssh";
   };
   config = mkIf cfg.enable {
     programs.ssh = {

modules/home/programs/steam/default.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption concatStringsSep head filter getExe;
-  cfg = config.home.gaming.steam;
+  cfg = config.home.programs.steam;
   steam-with-pkgs = pkgs.steam.override {
     extraPkgs = pkgs:
       with pkgs; [
@@ -52,7 +52,7 @@
     '';
 in {
   options = {
-    home.gaming.steam.enable = mkEnableOption "Enables steam";
+    home.programs.steam.enable = mkEnableOption "Enables steam";
   };
   config = {
     home.packages = mkIf cfg.enable [

modules/home/programs/tuirun/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.tuirun;
+  cfg = config.home.programs.tuirun;
 in {
   imports = [
     inputs.tuirun.homeManagerModules.default
   ];
   options = {
-    home.utils.tuirun.enable = mkEnableOption "Enables tuirun";
+    home.programs.tuirun.enable = mkEnableOption "Enables tuirun";
   };
   config = mkIf cfg.enable {
     programs.tuirun = {

modules/home/programs/vscode/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.devtools.vscode;
+  cfg = config.home.programs.vscode;
 in {
   options = {
-    home.devtools.vscode.enable = mkEnableOption "Enables vscode";
+    home.programs.vscode.enable = mkEnableOption "Enables vscode";
   };
   config = mkIf cfg.enable {
     programs.vscode = {

modules/home/programs/waybar/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.waybar;
+  cfg = config.home.programs.waybar;
 in {
   options = {
-    home.utils.waybar.enable = mkEnableOption "Enables waybar";
+    home.programs.waybar.enable = mkEnableOption "Enables waybar";
   };
   config = mkIf cfg.enable {
     systemd.user.services.waybar = {

modules/home/programs/wezterm/default.nix

@@ -9,10 +9,10 @@
   weztermPkg = pkgs.wezterm;
   # weztermFlake = inputs.wezterm.packages.${pkgs.system}.default;
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.cli.wezterm;
+  cfg = config.home.programs.wezterm;
 in {
   options = {
-    home.cli.wezterm.enable = mkEnableOption "Enables wezterm cli";
+    home.programs.wezterm.enable = mkEnableOption "Enables wezterm programs";
   };
   config = mkIf cfg.enable {
     programs.wezterm = {

modules/home/programs/yazi/default.nix

@@ -5,14 +5,14 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.utils.yazi;
+  cfg = config.home.programs.yazi;
 in {
   imports = [
     ./theme
   ];
 
   options = {
-    home.utils.yazi.enable = mkEnableOption "Enables yazi";
+    home.programs.yazi.enable = mkEnableOption "Enables yazi";
   };
   config = mkIf cfg.enable {
     programs.yazi = {