refactor config with better structure

home/config/niri/env.kdl

@@ -44,9 +44,6 @@ environment {
     // Clutter: Force Wayland backend.
     CLUTTER_BACKEND "wayland"
 
-    // Firefox: Force native Wayland rendering (massively improves scrolling smoothness).
-    MOZ_ENABLE_WAYLAND "1"
-
     // Electron/Chromium: Automatically flags apps (VS Code, Discord, Obsidian) to use Wayland.
     ELECTRON_OZONE_PLATFORM_HINT "auto"
 

home/default.nix

@@ -2,16 +2,14 @@
 
 {
   imports = [
-    ./user.nix
+    ./shell.nix
+    ./dotfiles.nix
     ./packages
-    ./desktopentries.nix
-    ./config
   ];
 
-  programs.git.enable = true;
-  programs.bash = {
-    enable = true;
-    bashrcExtra = "eval \"$(devenv hook bash)\"\n";
+  home = {
+    username = "prouk";
+    homeDirectory = "/home/prouk";
+    stateVersion = "26.05";
   };
-  home.stateVersion = "26.05";
 }

home/desktopentries.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  xdg.desktopEntries."awakened-poe-trade" = {
-    name = "Awakened PoE Trade";
-    exec = "${pkgs.awakened-poe-trade}/bin/awakened-poe-trade --no-overlay --listen=0.0.0.0:33333 %U";
-    terminal = false;
-    type = "Application";
-    icon = "awakened-poe-trade";
-    categories = [
-      "Game"
-      "Utility"
-    ];
-  };
-}

home/dotfiles.nix

@@ -1,28 +1,31 @@
 { ... }:
 {
+  # Desktop
   xdg.configFile."niri" = {
     force = true;
     recursive = true;
-    source = ./niri;
-  };
-  xdg.configFile."alacritty" = {
-    force = true;
-    recursive = true;
-    source = ./alacritty;
+    source = ./config/niri;
   };
   xdg.configFile."fuzzel" = {
     force = true;
     recursive = true;
-    source = ./fuzzel;
+    source = ./config/fuzzel;
   };
-  # Shared with SDDM (nixos/dm/sddm.nix); niri loads it from this path.
+  # Shared with SDDM (nixos/desktop/sddm.nix); niri loads it from this path.
   home.file."Pictures/Wallpapers/wallpaper.png" = {
     force = true;
-    source = ../../assets/wallpaper.png;
+    source = ../assets/wallpaper.png;
+  };
+
+  # Terminal
+  xdg.configFile."alacritty" = {
+    force = true;
+    recursive = true;
+    source = ./config/alacritty;
   };
   xdg.configFile."helix" = {
     force = true;
     recursive = true;
-    source = ./helix;
+    source = ./config/helix;
   };
 }

home/packages/audio.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    helvum
+    pavucontrol
+  ];
+}

home/packages/default.nix

@@ -1,11 +1,13 @@
 { ... }:
 {
   imports = [
-    ./development.nix
     ./desktop.nix
-    ./gaming.nix
+    ./system.nix
+    ./audio.nix
     ./hardware.nix
-    ./media.nix
+    ./development.nix
     ./web.nix
+    ./media.nix
+    ./gaming.nix
   ];
 }

home/packages/desktop.nix

@@ -1,9 +1,15 @@
 { pkgs, ... }:
 {
-  gtk = {
-    enable = true;
-  };
+  home.packages = with pkgs; [
+    alacritty
+    awww
+    fuzzel
+    wev
+    wl-clip-persist
+  ];
 
+  # Theming
+  gtk.enable = true;
   home.pointerCursor = {
     enable = true;
     gtk.enable = true;
@@ -14,15 +20,9 @@
     size = 24;
   };
 
-  home.packages = with pkgs; [
-    awww
-    btop
-    fuzzel
-    gparted
-    pavucontrol
-    wev
-    wl-clip-persist
-    yazi
-    alacritty
-  ];
+  # Removable drives
+  services.udiskie = {
+    enable = true;
+    automount = true;
+  };
 }

home/packages/development.nix

@@ -1,18 +1,18 @@
 { pkgs, ... }:
 {
-  programs.zed-editor = {
-    enable = true;
-    defaultEditor = false;
-  };
-
   home.packages = with pkgs; [
     devenv
     github-copilot-app
     github-copilot-cli
-    nil
-    nixd
+    helix
     jujutsu
     just
-    helix
+    nil
+    nixd
   ];
+
+  programs.zed-editor = {
+    enable = true;
+    defaultEditor = false;
+  };
 }

home/packages/gaming.nix

@@ -1,14 +1,33 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    awakened-poe-trade
-    lutris
-    rusty-path-of-building
-    protonup-qt
-    protontricks
-    winetricks
-    mangohud
-    steamtinkerlaunch
+    # Launchers
     gamma-launcher
+    lutris
+
+    # Wine / Proton
+    protontricks
+    protonup-qt
+    steamtinkerlaunch
+    winetricks
+
+    # Overlays
+    mangohud
+
+    # Path of Exile
+    awakened-poe-trade
+    rusty-path-of-building
   ];
+
+  xdg.desktopEntries."awakened-poe-trade" = {
+    name = "Awakened PoE Trade";
+    exec = "${pkgs.awakened-poe-trade}/bin/awakened-poe-trade --no-overlay --listen=0.0.0.0:33333 %U";
+    terminal = false;
+    type = "Application";
+    icon = "awakened-poe-trade";
+    categories = [
+      "Game"
+      "Utility"
+    ];
+  };
 }

home/packages/hardware.nix

@@ -2,12 +2,5 @@
 {
   home.packages = with pkgs; [
     wootility
-    wooting-udev-rules
-    helvum
   ];
-
-  services.udiskie = {
-    enable = true;
-    automount = true;
-  };
 }

home/packages/system.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    btop
+    gparted
+    yazi
+  ];
+}

home/shell.nix

@@ -0,0 +1,9 @@
+{ ... }:
+{
+  programs.bash = {
+    enable = true;
+    bashrcExtra = "eval \"$(devenv hook bash)\"\n";
+  };
+
+  programs.git.enable = true;
+}

home/user.nix

@@ -1,5 +0,0 @@
-{ ... }:
-{
-  home.username = "prouk";
-  home.homeDirectory = "/home/prouk";
-}