diff --git a/configuration.nix b/configuration.nix
index e50139e..33a80dc 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -36,9 +36,6 @@
     };
   };
 
-  # Nix settings
-  nixpkgs.config.allowUnfree = true;
-
   nix = {
     settings = {
       experimental-features = [
@@ -58,23 +55,6 @@
     };
   };
 
-  # Networking configuration
-  networking = {
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [ ];
-      allowedUDPPorts = [ ];
-    };
-    hostName = "pissbrick";
-    networkmanager.enable = true;
-    nameservers = [
-      "2606:4700:4700::1111"
-      "1.1.1.1"
-      "2606:4700:4700::1001"
-      "1.0.0.1"
-    ];
-  };
-
   # Time settings
   time.timeZone = "America/New_York";
 
@@ -95,8 +75,6 @@
     # };
   };
 
-  nix.package = pkgs.lixPackageSets.stable.lix;
-
   # Fonts configuration
   fonts = {
     fontconfig.enable = true;
@@ -122,14 +100,13 @@
     };
   };
 
-    displayManager.gdm.enable = true;
+  displayManager.gdm.enable = true;
 
-    xserver = {
-      videoDrivers = [ "nvidia" ];
-      xkb = {
-        layout = "us";
-        variant = "";
-      };
+  xserver = {
+    videoDrivers = [ "nvidia" ];
+    xkb = {
+      layout = "us";
+      variant = "";
     };
 
     dbus.packages = [
diff --git a/home.nix b/home.nix
index 77f0bff..dd5c611 100644
--- a/home.nix
+++ b/home.nix
@@ -3,7 +3,7 @@
   imports = [
     ./programs.nix
     ./packages.nix
-    ./hyprland.nix
+     #./hyprland.nix
     ./rofi.nix
     ./hyprpanel.nix
      #./spicetify.nix
diff --git a/networking.nix b/networking.nix
index e69de29..c561dab 100644
--- a/networking.nix
+++ b/networking.nix
@@ -0,0 +1,18 @@
+{ ... }:
+{
+  networking = {
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [ ];
+      allowedUDPPorts = [ ];
+    };
+    hostName = "pissbrick";
+    networkmanager.enable = true;
+    nameservers = [
+      "2606:4700:4700::1111"
+      "1.1.1.1"
+      "2606:4700:4700::1001"
+      "1.0.0.1"
+    ];
+  };
+}
diff --git a/packages.nix b/packages.nix
index 8464a87..8dfb5fe 100644
--- a/packages.nix
+++ b/packages.nix
@@ -2,10 +2,10 @@
 
 {
   home.packages = with pkgs; [
-
     # Games
     heroic
     modrinth-app
+    wineWow64Packages.stagingFull # Wine
 
     # Media
     vlc
@@ -15,8 +15,9 @@
     obs-studio
     grayjay
     lmms
+    qbittorrent
 
-    # Social
+    # Social / Messaging
     signal-desktop
     vesktop
     element-desktop
@@ -24,29 +25,34 @@
     # Launcher
     rofi
 
-    # Utility
+    # Utilities
     hyprshot
     gnome-calculator
     gimp
-
-    # Other
-    ntfs3g
-    exfat
-    git
-    lxqt.lxqt-openssh-askpass
-    libnotify
+    loupe
     obsidian
+
+    # File Management / Desktop Integration
     nautilus
-    inputs.zen-browser.packages."${stdenv.hostPlatform.system}".twilight
-    usbutils
     udiskie
     gvfs
     pavucontrol
-    bibata-cursors
-    brgenml1lpr
-    loupe
+
+    # Browser
+    inputs.zen-browser.packages."${stdenv.hostPlatform.system}".twilight
+
+    # System / Hardware / Filesystems
+    ntfs3g
+    exfat
+    usbutils
+    lm_sensors
+    bluez
+    bluez-tools
+    openssl
+
+    # Dev / CLI / Nix Tools
+    git
     nixfmt
-    wineWow64Packages.stagingFull # Wine
     nh # Nix CLI helper
     fd # Fast "find" command alternative
     btop-cuda # CLI Task manager
@@ -55,27 +61,25 @@
     dysk # Diskusage CLI tool
     fastfetch # system information
     p7zip
-    lm_sensors
     nixd
-    bluez
-    bluez-tools
-    openssl
     rclone
-    hyprpolkitagent
-    qbittorrent
 
-    # Deps
+    # Desktop / Auth / Session Helpers
+    lxqt.lxqt-openssh-askpass
+    hyprpolkitagent
     polkit-gnome
     gnome-keyring
     gcr # Added for compatibility with gnome-keyring packages
-    niri # Niri DE
 
-    # theming (Most for nautilus and other gnome apps)
-    adwaitia-icon-theme
+    # Printing / Drivers
+    # brgenml1lpr (Don't have a printerS)
+
+    # Theming
+    bibata-cursors
+    adwaita-icon-theme
     adw-gtk3
   ];
 
-  nix.package = pkgs.lixPackageSets.stable.lix;
-  # package manager that makes package management reliable and reproducible
-
+  nixpkgs.config.allowUnfree = true;
+  nix.package = pkgs.lixPackageSets.stable.lix; # package manager that makes package management reliable and reproducible
 }
diff --git a/programs.nix b/programs.nix
index 944d9a8..bf7cd73 100644
--- a/programs.nix
+++ b/programs.nix
@@ -30,10 +30,16 @@
 
     kdeconnect.enable = true;
 
-    fish.enable = true;
+    fish = {
+      enable = true;
+    };
 
-    foot.enable = true;
+    foot = {
+      enable = true;
+    };
 
-    spicetify.enable = true;
+    spicetify = {
+      enable = true;
+    };
   };
 }