diff --git a/configuration.nix b/configuration.nix
index ba44673..e50139e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -97,25 +97,6 @@
 
   nix.package = pkgs.lixPackageSets.stable.lix;
 
-  # Programs configuration
-  programs = {
-    steam.enable = true;
-    fish.enable = true;
-    foot.enable = true;
-
-    #hyprland = {
-    #  enable = true;
-    #  withUWSM = true;
-    #  xwayland.enable = true;
-    #};
-
-    niri = {
-       enable = true;
-      };
-
-    # spicetify.enable = true;
-  };
-
   # Fonts configuration
   fonts = {
     fontconfig.enable = true;
@@ -141,17 +122,6 @@
     };
   };
 
-  # Services configuration
-  services = {
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      jack.enable = true;
-      wireplumber.enable = true;
-    };
-
     displayManager.gdm.enable = true;
 
     xserver = {
@@ -162,11 +132,6 @@
       };
     };
 
-    tetrd.enable = true;
-
-    openssh.enable = true;
-    libinput.enable = true;
-
     dbus.packages = [
       pkgs.gnome-keyring
       pkgs.gcr
@@ -185,5 +150,4 @@
   # This is used for compatibility.
   # Do NOT change this after installing.
   system.stateVersion = "25.11";
-
 }
diff --git a/home.nix b/home.nix
index bdc4b63..77f0bff 100644
--- a/home.nix
+++ b/home.nix
@@ -6,8 +6,9 @@
     ./hyprland.nix
     ./rofi.nix
     ./hyprpanel.nix
-    ./spicetify.nix
+     #./spicetify.nix
     ./services.nix
+    ./networking.nix
   ];
 
   home.username = "pissbrick";
diff --git a/hyprland.nix b/hyprland.nix
new file mode 100644
index 0000000..bf418fc
--- /dev/null
+++ b/hyprland.nix
@@ -0,0 +1,251 @@
+{ pkgs, lib, ... }:
+
+{
+  wayland.windowManager.hyprland = {
+    enable = true;
+    systemd.enable = false;
+
+    settings = {
+      # --- MONITORS ---
+      monitor = [
+        "eDP-1, 1920x1080@144, 0x0, 1"
+      ];
+
+      xwayland = {
+        force_zero_scaling = true;
+      };
+
+      # --- MY PROGRAMS (Variables) ---
+      "$terminal" = "foot";
+      "$fileManager" = "dolphin";
+      "$menu" = "rofi -show drun";
+      "$mainMod" = "SUPER";
+
+      # --- AUTOSTART ---
+      "exec-once" = [
+        # "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+        # Run this once to make sure the daemon is actually handling secrets/ssh
+        # "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP eval (gnome-keyring-daemon --start --components=secrets,ssh)"
+        "hyprpaper"
+        "hyprpanel"
+        "greenseed"
+        "signal-desktop"
+        "vesktop"
+        "kdeconnect-indicator"
+
+        # Push variables so the background agent can find the Askpass window
+        "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP SSH_AUTH_SOCK"
+        "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP SSH_AUTH_SOCK"
+
+        # Auto-load key on login (using the Askpass we just configured)
+        "ssh-add ~/.ssh/id_ed25519 </dev/null"
+      ];
+
+      # --- ENVIRONMENT VARIABLES ---
+      env = [
+        "HYPRCURSOR_THEME,Bibata-Modern-Classic"
+        "HYPRCURSOR_SIZE,20"
+        "XCURSOR_THEME,Bibata-Modern-Classic"
+        "XCURSOR_SIZE,20"
+      ];
+
+      # --- LOOK AND FEEL ---
+      general = {
+        gaps_in = 5;
+        gaps_out = 6;
+        border_size = 2;
+        resize_on_border = false;
+        allow_tearing = false;
+        layout = "dwindle";
+      };
+
+      layerrule = [
+        "blur on, match:namespace ^(rofi|hyprpanel|bar-0)$"
+        "ignore_alpha 1, match:namespace ^(rofi|hyprpanel|bar-0)$"
+      ];
+
+      decoration = {
+        rounding = 10;
+        active_opacity = 0.9;
+        inactive_opacity = 0.9;
+        fullscreen_opacity = 0.9;
+
+        shadow = {
+          enabled = true;
+          ignore_window = true;
+          range = 15;
+          render_power = 2;
+        };
+
+        blur = {
+          enabled = true;
+          size = 6;
+          passes = 3;
+          new_optimizations = true;
+          ignore_opacity = true;
+          xray = false;
+          noise = 0.02;
+          contrast = 1.1;
+          brightness = 1.0;
+          vibrancy = 0.2;
+          vibrancy_darkness = 0.5;
+        };
+      };
+
+      animations = {
+        enabled = true;
+        bezier = [
+          "easeOutQuint, 0.23, 1, 0.32, 1"
+          "easeInOutCubic, 0.65, 0.05, 0.36, 1"
+          "linear, 0, 0, 1, 1"
+          "almostLinear, 0.5, 0.5, 0.75, 1"
+          "quick, 0.15, 0, 0.1, 1"
+        ];
+        animation = [
+          "global, 1, 10, default"
+          "border, 1, 5.39, easeOutQuint"
+          "windows, 1, 4.79, easeOutQuint"
+          "windowsIn, 1, 4.1, easeOutQuint, popin 87%"
+          "windowsOut, 1, 1.49, linear, popin 87%"
+          "fadeIn, 1, 1.73, almostLinear"
+          "fadeOut, 1, 1.46, almostLinear"
+          "fade, 1, 3.03, quick"
+          "layers, 1, 3.81, easeOutQuint"
+          "layersIn, 1, 4, easeOutQuint, fade"
+          "layersOut, 1, 1.5, linear, fade"
+          "fadeLayersIn, 1, 1.79, almostLinear"
+          "fadeLayersOut, 1, 1.39, almostLinear"
+          "workspaces, 1, 1.94, almostLinear, fade"
+          "workspacesIn, 1, 1.21, almostLinear, fade"
+          "workspacesOut, 1, 1.94, almostLinear, fade"
+          "zoomFactor, 1, 7, quick"
+        ];
+      };
+
+      # --- LAYOUTS ---
+      dwindle = {
+        pseudotile = true;
+        preserve_split = true;
+      };
+
+      master = {
+        new_status = "master";
+      };
+
+      misc = {
+        force_default_wallpaper = -1;
+      };
+
+      # --- INPUT ---
+      input = {
+        kb_layout = "us";
+        follow_mouse = 1;
+        sensitivity = 0;
+        touchpad = {
+          natural_scroll = false;
+        };
+      };
+
+      gesture = [
+        "3, horizontal, workspace"
+      ];
+
+      device = [
+        {
+          name = "epic-mouse-v1";
+          sensitivity = -0.5;
+        }
+      ];
+
+      # --- KEYBINDINGS ---
+      bind = [
+        "$mainMod, Q, exec, $terminal"
+        "$mainMod, C, exec, if hyprctl activewindow -j | jq -r '.class' | grep -q 'main.bin'; then notify-send \"Greenseed Protected\" \"Close prevented to keep trades running\"; else hyprctl dispatch killactive; fi"
+        "$mainMod, M, exit,"
+        "$mainMod, E, exec, $fileManager"
+        "$mainMod, V, togglefloating,"
+        "$mainMod, SPACE, exec, $menu"
+        "$mainMod, P, pseudo,"
+        "$mainMod, J, togglesplit,"
+        "$mainMod, S, exec, hyprctl dispatch movetoworkspace special:greenseed,class:^main\\.bin$ && hyprctl dispatch togglespecialworkspace greenseed"
+        "$mainMod, left, movefocus, l"
+        "$mainMod, right, movefocus, r"
+        "$mainMod, up, movefocus, u"
+        "$mainMod, down, movefocus, d"
+        "$mainMod, 1, workspace, 1"
+        "$mainMod, 2, workspace, 2"
+        "$mainMod, 3, workspace, 3"
+        "$mainMod, 4, workspace, 4"
+        "$mainMod, 5, workspace, 5"
+        "$mainMod, 6, workspace, 6"
+        "$mainMod, 7, workspace, 7"
+        "$mainMod, 8, workspace, 8"
+        "$mainMod, 9, workspace, 9"
+        "$mainMod, 0, workspace, 10"
+        "$mainMod SHIFT, 1, movetoworkspace, 1"
+        "$mainMod SHIFT, 2, movetoworkspace, 2"
+        "$mainMod SHIFT, 3, movetoworkspace, 3"
+        "$mainMod SHIFT, 4, movetoworkspace, 4"
+        "$mainMod SHIFT, 5, movetoworkspace, 5"
+        "$mainMod SHIFT, 6, movetoworkspace, 6"
+        "$mainMod SHIFT, 7, movetoworkspace, 7"
+        "$mainMod SHIFT, 8, movetoworkspace, 8"
+        "$mainMod SHIFT, 9, movetoworkspace, 9"
+        "$mainMod SHIFT, 0, movetoworkspace, 10"
+        "$mainMod, mouse_down, workspace, e+1"
+        "$mainMod, mouse_up, workspace, e-1"
+        "$mainMod, F, fullscreen"
+        "$mainMod, PRINT, exec, hyprshot -m window -z --clipboard-only"
+        "$mainMod CONTROL, PRINT, exec, hyprshot -m window -z"
+        ", PRINT, exec, hyprshot -m output -z --clipboard-only"
+        "CONTROL, PRINT, exec, hyprshot -m output -z"
+        "$mainMod SHIFT, S, exec, hyprshot -m region -z --clipboard-only"
+        "$mainMod SHIFT CONTROL, S, exec, hyprshot -m region -z"
+      ];
+
+      bindm = [
+        "$mainMod, mouse:272, movewindow"
+        "$mainMod, mouse:273, resizewindow"
+      ];
+
+      bindel = [
+        ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
+        ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+        ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+        ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
+        ",XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+"
+        ",XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-"
+      ];
+
+      bindl = [
+        ", XF86AudioNext, exec, playerctl next"
+        ", XF86AudioPause, exec, playerctl play-pause"
+        ", XF86AudioPlay, exec, playerctl play-pause"
+        ", XF86AudioPrev, exec, playerctl previous"
+      ];
+
+      # --- WINDOW RULES ---
+      windowrule = [
+        # Grayjay
+        "match:class ^cef$, match:title ^Grayjay$, opaque on"
+        "match:class ^cef$, match:title ^Grayjay$, opacity 1.0 override 1.0 override"
+
+        # Minecraft
+        "match:title ^Minecraft.*, opaque on"
+        "match:title ^Minecraft.*, opacity 1.0 override 1.0 override"
+
+        # Virtual Machine Manager
+        "match:title .*(?i)virtual.*, opaque on"
+        "match:title .*(?i)virtual.*, opacity 1.0 override 1.0 override"
+
+        # Tetris (Case-insensitive & Partial match)
+        "match:title .*(?i)tetris.*, opaque on"
+        "match:title .*(?i)tetris.*, opacity 1.0 override 1.0 override"
+
+        # Fixes
+        "suppress_event maximize, match:class .*"
+        "no_focus 1, match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0"
+      ];
+    };
+  };
+}
diff --git a/networking.nix b/networking.nix
new file mode 100644
index 0000000..e69de29
diff --git a/system-programs.nix b/programs.nix
similarity index 88%
rename from system-programs.nix
rename to programs.nix
index 5c937eb..944d9a8 100644
--- a/system-programs.nix
+++ b/programs.nix
@@ -23,8 +23,17 @@
     };
 
     steam.enable = true;
+
     dconf.enable = true;
+
     nix-ld.enable = true;
+
     kdeconnect.enable = true;
+
+    fish.enable = true;
+
+    foot.enable = true;
+
+    spicetify.enable = true;
   };
 }
diff --git a/services.nix b/services.nix
index efd7971..15445b4 100644
--- a/services.nix
+++ b/services.nix
@@ -1,14 +1,110 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
-  services.kdeconnect = {
-    enable = true;
-    indicator = true;
-  };
+  services = {
+    kdeconnect = {
+      enable = true;
+      indicator = true;
+    };
+
+    udiskie = {
+      enable = true;
+      settings = {
+        automount = true;
+        notify = true;
+        use_tray = true;
+      };
+    };
+
+    openssh.enable = true;
+
+    tetrd.enable = true;
+
+    upower = {
+      enable = true;
+      ignoreLid = true;
+    };
+
+    power-profiles-daemon.enable = true;
+    tlp.enable = lib.mkForce false;
+
+    udev.extraRules = ''
+      SUBSYSTEM=="power_supply", ATTR{online}=="1", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set performance"
+      SUBSYSTEM=="power_supply", ATTR{online}=="0", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set power-saver"
+    '';
+
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+
+      wireplumber.extraConfig = {
+        "99-custom-quantum.conf" = {
+          "context.properties" = {
+            "default.clock.rate" = 48000;
+            "default.clock.allowed-rates" = [ 44100 48000 96000 ];
+            "default.clock.quantum" = 1024;
+            "default.clock.min-quantum" = 512;
+            "default.clock.max-quantum" = 8192;
+          };
+
+          "context.modules" = [
+            {
+              name = "libpipewire-module-rt";
+              args = {
+                "nice.level" = -20;
+                "rt.prio" = 99;
+                "rt.time.soft" = 200000;
+                "rt.time.hard" = 200000;
+              };
+              flags = [ "ifexists" "nofail" ];
+            }
+          ];
+        };
+      };
+    };
+
+    blueman.enable = true;
+    gvfs.enable = true;
+    udisks2.enable = true;
+    acpid.enable = true;
+
+    geoclue2 = {
+      enable = true;
+      enableWifi = true;
+    };
+
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    xserver = {
+      enable = true;
+      libinput.enable = true;
+
+      xkb = {
+        layout = "us";
+        variant = "";
+      };
+
+      displayManager.gdm.enable = true;
+    };
+
+    gnome = {
+      gnome-keyring.enable = true;
+      gcr-ssh-agent.enable = false;
+    };
+
+    dbus.enable = true;
 
-  services.udiskie.settings = {
-    automount = true;
-    notify = true;
-    use_tray = true; # Shows icon in system tray
+    logind.settings.Login = {
+      HandleLidSwitch = "ignore";
+      HandleLidSwitchExternalPower = "ignore";
+      HandleLidSwitchDocked = "ignore";
+    };
   };
 }
diff --git a/system-service.nix b/system-service.nix
deleted file mode 100644
index 2b42051..0000000
--- a/system-service.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ pkgs, lib, ... }:
-
-
-# modify the upower & logind.settings.login options
-{
-  services = {
-    upower = {
-      enable = true;
-      ignoreLid = true;
-    };
-
-    power-profiles-daemon.enable = true;
-    tlp.enable = lib.mkForce false;
-
-    # Power profile switching on AC/Battery
-    udev.extraRules = ''
-      # On AC: Set performance profile
-      SUBSYSTEM=="power_supply", ATTR{online}=="1", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set performance"
-
-      # On Battery: Set power-saver profile
-      SUBSYSTEM=="power_supply", ATTR{online}=="0", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set power-saver"
-    '';
-
-    pipewire = {
-      enable = true;
-      pulse.enable = true;
-      wireplumber = {
-        extraConfig = {
-          "99-custom-quantum.conf" = {
-            "context.properties" = {
-              "default.clock.rate" = 48000;
-              "default.clock.allowed-rates" = [
-                44100
-                48000
-                96000
-              ];
-              "default.clock.quantum" = 1024;
-              "default.clock.min-quantum" = 512;
-              "default.clock.max-quantum" = 8192;
-            };
-            "context.modules" = [
-              {
-                name = "libpipewire-module-rt";
-                args = {
-                  "nice.level" = -20;
-                  "rt.prio" = 99;
-                  "rt.time.soft" = 200000;
-                  "rt.time.hard" = 200000;
-                };
-                flags = [
-                  "ifexists"
-                  "nofail"
-                ];
-              }
-            ];
-          };
-        };
-      };
-    };
-
-    blueman.enable = true;
-
-    gvfs.enable = true;
-    udisks2.enable = true;
-
-    displayManager.gdm.enable = true;
-    acpid.enable = true;
-
-    geoclue2 = {
-      enable = true;
-      enableWifi = true;
-    };
-
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-
-    xserver = {
-      xkb = {
-        layout = "us";
-        variant = "";
-      };
-    };
-
-    openssh.enable = true;
-    libinput.enable = true;
-
-    gnome = {
-      gnome-keyring.enable = true;
-      gcr-ssh-agent.enable = false;
-    };
-
-    dbus = {
-      enable = true;
-      packages = [ ];
-    };
-
-    logind = {
-      settings.Login = {
-        HandleLidSwitch = "ignore";
-        HandleLidSwitchExternalPower = "ignore";
-        HandleLidSwitchDocked = "ignore";
-      };
-    };
-  };
-}