diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index c35693e..618441f 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -1,10 +1,10 @@
 {
   networking.hostName = "laptop";
 
-  hypridle.enable = true;
   led.enable = true;
   gnome.enable = true;
   home-manager.users.joy.code.enable = true;
+  home-manager.users.joy.hypridle.enable = true;
 
   imports = [
     ./hardware.nix
diff --git a/modules/default.nix b/modules/default.nix
index d19bb5a..8fe8314 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,7 +5,7 @@
     ./system
     ./hardware
     ./services
-    ./programs
     ./secrets
+    ./programs
   ];
 }
diff --git a/modules/programs/home/bat/default.nix b/modules/programs/bat/default.nix
similarity index 100%
rename from modules/programs/home/bat/default.nix
rename to modules/programs/bat/default.nix
diff --git a/modules/programs/home/cmus/default.nix b/modules/programs/cmus/default.nix
similarity index 100%
rename from modules/programs/home/cmus/default.nix
rename to modules/programs/cmus/default.nix
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index b91a125..c03311b 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -2,7 +2,7 @@
   home-manager = {
     extraSpecialArgs = {inherit inputs;};
     users = {
-      "joy" = import ./home;
+      "joy" = import ./home.nix;
     };
   };
 }
diff --git a/modules/programs/home/git/default.nix b/modules/programs/git/default.nix
similarity index 100%
rename from modules/programs/home/git/default.nix
rename to modules/programs/git/default.nix
diff --git a/modules/programs/home/helix/default.nix b/modules/programs/helix/default.nix
similarity index 98%
rename from modules/programs/home/helix/default.nix
rename to modules/programs/helix/default.nix
index 82a13a0..dc396ba 100644
--- a/modules/programs/home/helix/default.nix
+++ b/modules/programs/helix/default.nix
@@ -23,6 +23,7 @@
 
   home.packages = with pkgs; [
     texlab
+    texliveFull
     nil
     clang-tools
     javascript-typescript-langserver
diff --git a/modules/programs/home/default.nix b/modules/programs/home.nix
similarity index 72%
rename from modules/programs/home/default.nix
rename to modules/programs/home.nix
index 9127a45..85f49db 100644
--- a/modules/programs/home/default.nix
+++ b/modules/programs/home.nix
@@ -1,20 +1,15 @@
 {
   imports = [
-    ./foot
-    ./mpv
-    ./firefox
-    ./git
-    ./helix
-    ./newsboat
-    ./rofi
-    ./zsh
-    ./zoxide
     ./bat
     ./cmus
     ./tmux
     ./mail
     ./yazi
-    ./code
+    ./zsh
+    ./git
+    ./helix
+    ./newsboat
+    ./zoxide
     ./misc
   ];
 }
diff --git a/modules/programs/home/mail/accounts.nix b/modules/programs/mail/accounts.nix
similarity index 100%
rename from modules/programs/home/mail/accounts.nix
rename to modules/programs/mail/accounts.nix
diff --git a/modules/programs/home/mail/default.nix b/modules/programs/mail/default.nix
similarity index 100%
rename from modules/programs/home/mail/default.nix
rename to modules/programs/mail/default.nix
diff --git a/modules/programs/home/mail/muttrc b/modules/programs/mail/muttrc
similarity index 100%
rename from modules/programs/home/mail/muttrc
rename to modules/programs/mail/muttrc
diff --git a/modules/programs/misc/default.nix b/modules/programs/misc/default.nix
new file mode 100644
index 0000000..994d728
--- /dev/null
+++ b/modules/programs/misc/default.nix
@@ -0,0 +1,25 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    git
+    htop
+    ncdu
+    libnotify
+    brightnessctl
+    ffmpeg
+    lm_sensors
+    alejandra
+    tree
+    zip
+    unzip
+    yt-dlp
+    wget
+    fastfetch
+    cmatrix
+    cava
+    nitch
+    gotop
+    sl
+    cbonsai
+    pipes
+  ];
+}
diff --git a/modules/programs/home/newsboat/default.nix b/modules/programs/newsboat/default.nix
similarity index 100%
rename from modules/programs/home/newsboat/default.nix
rename to modules/programs/newsboat/default.nix
diff --git a/modules/programs/home/tmux/default.nix b/modules/programs/tmux/default.nix
similarity index 100%
rename from modules/programs/home/tmux/default.nix
rename to modules/programs/tmux/default.nix
diff --git a/modules/programs/home/xdg/default.nix b/modules/programs/xdg/default.nix
similarity index 100%
rename from modules/programs/home/xdg/default.nix
rename to modules/programs/xdg/default.nix
diff --git a/modules/programs/home/yazi/default.nix b/modules/programs/yazi/default.nix
similarity index 100%
rename from modules/programs/home/yazi/default.nix
rename to modules/programs/yazi/default.nix
diff --git a/modules/programs/home/zoxide/default.nix b/modules/programs/zoxide/default.nix
similarity index 100%
rename from modules/programs/home/zoxide/default.nix
rename to modules/programs/zoxide/default.nix
diff --git a/modules/programs/home/zsh/default.nix b/modules/programs/zsh/default.nix
similarity index 86%
rename from modules/programs/home/zsh/default.nix
rename to modules/programs/zsh/default.nix
index fa3f3c9..204febf 100644
--- a/modules/programs/home/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -15,8 +15,8 @@
       cat = "bat";
       lg = "${pkgs.lazygit}/bin/lazygit";
       ser = "ssh root@joygnu.org";
-      ip = "sh ~/nix/modules/programs/home/zsh/scripts/ip.sh";
-      rb = "sh ~/nix/modules/programs/home/zsh/scripts/rebuild.sh";
+      ip = "sh ~/nix/modules/programs/zsh/scripts/ip.sh";
+      rb = "sh ~/nix/modules/programs/zsh/scripts/rebuild.sh";
       fr = "doas systemctl reboot --firmware";
       up = "nix flake update --flake ~/nix/";
       del = "doas nix-collect-garbage -d";
diff --git a/modules/programs/home/zsh/scripts/ip.sh b/modules/programs/zsh/scripts/ip.sh
similarity index 100%
rename from modules/programs/home/zsh/scripts/ip.sh
rename to modules/programs/zsh/scripts/ip.sh
diff --git a/modules/programs/home/zsh/scripts/rebuild.sh b/modules/programs/zsh/scripts/rebuild.sh
similarity index 100%
rename from modules/programs/home/zsh/scripts/rebuild.sh
rename to modules/programs/zsh/scripts/rebuild.sh
diff --git a/modules/services/default.nix b/modules/services/default.nix
index d756db1..b382554 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,9 +1,6 @@
 {
   imports = [
     ./vm
-    ./gdm
-    ./dunst
-    ./polkit
     ./syncthing
     ./docker
     ./ssh
diff --git a/modules/system/misc/default.nix b/modules/system/misc/default.nix
index c2b8885..925984f 100644
--- a/modules/system/misc/default.nix
+++ b/modules/system/misc/default.nix
@@ -6,7 +6,4 @@
   users.defaultUserShell = pkgs.zsh;
   services.xserver.excludePackages = [pkgs.xterm];
   programs.nano.enable = false;
-  # environment.systemPackages = [
-  # pkgs.vim
-  # ];
 }
diff --git a/modules/wm/ags/default.nix b/modules/wm/ags/default.nix
deleted file mode 100644
index d847d1f..0000000
--- a/modules/wm/ags/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{inputs, ...}: {
-  home-manager.users.joy = {
-    imports = [inputs.ags.homeManagerModules.default];
-    programs.ags = {
-      enable = true;
-      configDir = ./bar;
-    };
-  };
-}
diff --git a/modules/wm/clip/default.nix b/modules/wm/clip/default.nix
deleted file mode 100644
index 4db3f91..0000000
--- a/modules/wm/clip/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{pkgs, ...}: {
-  home-manager.users.joy = {
-    home.packages = with pkgs; [
-      wl-clipboard
-    ];
-
-    services.cliphist.enable = true;
-  };
-}
diff --git a/modules/wm/default.nix b/modules/wm/default.nix
index b422ec5..fc9f556 100644
--- a/modules/wm/default.nix
+++ b/modules/wm/default.nix
@@ -1,12 +1,15 @@
-{
+{inputs, ...}: {
   imports = [
     ./hyprland
-    ./hypridle
-    ./ags
     ./theme
-    ./clip
     ./gnome
-    ./screen
-    ./misc
+    ./polkit
+    ./gdm
   ];
+  home-manager = {
+    extraSpecialArgs = {inherit inputs;};
+    users = {
+      "joy" = import ./home;
+    };
+  };
 }
diff --git a/modules/services/gdm/default.nix b/modules/wm/gdm/default.nix
similarity index 100%
rename from modules/services/gdm/default.nix
rename to modules/wm/gdm/default.nix
diff --git a/modules/wm/ags/bar/config.js b/modules/wm/home/ags/bar/config.js
similarity index 100%
rename from modules/wm/ags/bar/config.js
rename to modules/wm/home/ags/bar/config.js
diff --git a/modules/wm/ags/bar/style.css b/modules/wm/home/ags/bar/style.css
similarity index 100%
rename from modules/wm/ags/bar/style.css
rename to modules/wm/home/ags/bar/style.css
diff --git a/modules/wm/home/ags/default.nix b/modules/wm/home/ags/default.nix
new file mode 100644
index 0000000..7b53d29
--- /dev/null
+++ b/modules/wm/home/ags/default.nix
@@ -0,0 +1,7 @@
+{inputs, ...}: {
+  imports = [inputs.ags.homeManagerModules.default];
+  programs.ags = {
+    enable = true;
+    configDir = ./bar;
+  };
+}
diff --git a/modules/wm/ags/tsconfig.json b/modules/wm/home/ags/tsconfig.json
similarity index 100%
rename from modules/wm/ags/tsconfig.json
rename to modules/wm/home/ags/tsconfig.json
diff --git a/modules/wm/home/clip/default.nix b/modules/wm/home/clip/default.nix
new file mode 100644
index 0000000..ac07014
--- /dev/null
+++ b/modules/wm/home/clip/default.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    wl-clipboard
+  ];
+
+  services.cliphist.enable = true;
+}
diff --git a/modules/programs/home/code/default.nix b/modules/wm/home/code/default.nix
similarity index 100%
rename from modules/programs/home/code/default.nix
rename to modules/wm/home/code/default.nix
diff --git a/modules/wm/home/default.nix b/modules/wm/home/default.nix
new file mode 100644
index 0000000..7169cf6
--- /dev/null
+++ b/modules/wm/home/default.nix
@@ -0,0 +1,14 @@
+{
+  imports = [
+    ./foot
+    ./ags
+    ./mpv
+    ./screen
+    ./firefox
+    ./rofi
+    ./code
+    ./hypridle
+    ./dunst
+    ./misc
+  ];
+}
diff --git a/modules/services/dunst/default.nix b/modules/wm/home/dunst/default.nix
similarity index 94%
rename from modules/services/dunst/default.nix
rename to modules/wm/home/dunst/default.nix
index ca6f25d..12750e0 100644
--- a/modules/services/dunst/default.nix
+++ b/modules/wm/home/dunst/default.nix
@@ -1,5 +1,5 @@
 {lib, ...}: {
-  home-manager.users.joy.services.dunst = {
+  services.dunst = {
     enable = true;
     settings = {
       global = {
diff --git a/modules/programs/home/firefox/default.nix b/modules/wm/home/firefox/default.nix
similarity index 100%
rename from modules/programs/home/firefox/default.nix
rename to modules/wm/home/firefox/default.nix
diff --git a/modules/programs/home/firefox/userChrome b/modules/wm/home/firefox/userChrome
similarity index 100%
rename from modules/programs/home/firefox/userChrome
rename to modules/wm/home/firefox/userChrome
diff --git a/modules/programs/home/foot/default.nix b/modules/wm/home/foot/default.nix
similarity index 100%
rename from modules/programs/home/foot/default.nix
rename to modules/wm/home/foot/default.nix
diff --git a/modules/wm/hypridle/default.nix b/modules/wm/home/hypridle/default.nix
similarity index 91%
rename from modules/wm/hypridle/default.nix
rename to modules/wm/home/hypridle/default.nix
index cdb8751..b961e02 100644
--- a/modules/wm/hypridle/default.nix
+++ b/modules/wm/home/hypridle/default.nix
@@ -8,7 +8,7 @@
   };
 
   config = lib.mkIf config.hypridle.enable {
-    home-manager.users.joy.services.hypridle = {
+    services.hypridle = {
       enable = true;
       settings = {
         listener = [
diff --git a/modules/programs/home/misc/default.nix b/modules/wm/home/misc/default.nix
similarity index 54%
rename from modules/programs/home/misc/default.nix
rename to modules/wm/home/misc/default.nix
index eb3dbc1..b9edb99 100644
--- a/modules/programs/home/misc/default.nix
+++ b/modules/wm/home/misc/default.nix
@@ -1,45 +1,26 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    # cli
-    git
-    htop
-    ncdu
-    libnotify
-    brightnessctl
-    ffmpeg
-    lm_sensors
+    hyprpicker
+    playerctl
+    rofimoji
+    pwvucontrol
+    pulseaudioFull
     sent
-    texliveFull
-    alejandra
-    tree
-    zip
-    unzip
-    yt-dlp
-    wget
-    fastfetch
-    cmatrix
-    cava
-    nitch
-    gotop
-    sl
-    cbonsai
-    pipes
-    #gui
     imv
+    signal-desktop
     keepassxc
     vesktop
-    signal-desktop
     bottles
     boxbuddy
-    transmission_4-gtk
-    kdePackages.kdenlive
     ferdium
     drawio
-    obs-studio
     distrobox
-    pulseaudioFull
+    obs-studio
+    transmission_4-gtk
+    gnome-clocks
     gnome-calculator
     gnome-disk-utility
-    gnome-clocks
+    gnome-sound-recorder
+    kdePackages.kdenlive
   ];
 }
diff --git a/modules/programs/home/mpv/default.nix b/modules/wm/home/mpv/default.nix
similarity index 100%
rename from modules/programs/home/mpv/default.nix
rename to modules/wm/home/mpv/default.nix
diff --git a/modules/programs/home/rofi/default.nix b/modules/wm/home/rofi/default.nix
similarity index 72%
rename from modules/programs/home/rofi/default.nix
rename to modules/wm/home/rofi/default.nix
index 4170636..6be4578 100644
--- a/modules/programs/home/rofi/default.nix
+++ b/modules/wm/home/rofi/default.nix
@@ -6,7 +6,7 @@
   programs.rofi = {
     enable = true;
     package = pkgs.rofi-wayland;
-    theme = lib.mkForce "~/nix/modules/programs/home/rofi/gruvbox-material.rasi";
+    theme = lib.mkForce "~/nix/modules/wm/home/rofi/gruvbox-material.rasi";
     extraConfig = {
       display-drun = "";
       show-icons = true;
diff --git a/modules/programs/home/rofi/gruvbox-material.rasi b/modules/wm/home/rofi/gruvbox-material.rasi
similarity index 100%
rename from modules/programs/home/rofi/gruvbox-material.rasi
rename to modules/wm/home/rofi/gruvbox-material.rasi
diff --git a/modules/wm/home/screen/default.nix b/modules/wm/home/screen/default.nix
new file mode 100644
index 0000000..9868e0f
--- /dev/null
+++ b/modules/wm/home/screen/default.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  home.file.".config/swappy/config".text = ''
+    [Default]
+    save_dir=$HOME/media/pics/screen
+  '';
+
+  home.packages = with pkgs; [
+    grim
+    slurp
+    swappy
+  ];
+}
diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix
index 8ea527b..cca0234 100644
--- a/modules/wm/hyprland/default.nix
+++ b/modules/wm/hyprland/default.nix
@@ -39,6 +39,7 @@
           "float,title:(Clocks)"
           "size 854 480,title:(Clocks)"
           "float,title:(Network Connections)"
+          "float,title:(Pipewire)"
         ];
         gestures = {
           workspace_swipe = true;
diff --git a/modules/wm/misc/default.nix b/modules/wm/misc/default.nix
deleted file mode 100644
index a9f854e..0000000
--- a/modules/wm/misc/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  home-manager.users.joy = {
-    home.packages = with pkgs; [
-      hyprpicker
-      playerctl
-      rofimoji
-      pwvucontrol
-    ];
-  };
-}
diff --git a/modules/services/polkit/default.nix b/modules/wm/polkit/default.nix
similarity index 100%
rename from modules/services/polkit/default.nix
rename to modules/wm/polkit/default.nix
diff --git a/modules/wm/screen/default.nix b/modules/wm/screen/default.nix
deleted file mode 100644
index d48a4a3..0000000
--- a/modules/wm/screen/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  home-manager.users.joy = {
-    home.file.".config/swappy/config".text = ''
-      [Default]
-      save_dir=$HOME/media/pics/screen
-    '';
-
-    home.packages = with pkgs; [
-      grim
-      slurp
-      swappy
-    ];
-  };
-}