diff --git a/home/hyprland.nix b/home/hyprland.nix
index 8502e2e2..8825871c 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -1,8 +1,6 @@
 { pkgs, ... }:
 
 let
-  inherit (pkgs) hyprdim hyprnome hypridle hyprlock swww grimblast polkit_gnome;
-
   opacity = "0.95";
   super = "SUPER";
 
@@ -13,13 +11,27 @@ let
   swapBackgroundScript = "hypr/swap-bg.fish";
 in
 {
-  home.packages = [
+  home.packages = with pkgs; [
     hyprdim
     hyprnome
     hypridle
     hyprlock
     swww
     grimblast
+    brightnessctl
+    playerctl
+    mpvpaper
+    lnch
+    wev
+    tessen
+    wtype
+    dmenu-wayland
+    thud
+    python311Packages.icoextract
+    wallust
+    activate-linux
+    wl-clipboard-rs
+    wf-recorder
   ];
 
   wayland.windowManager.hyprland = {
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 12e3144c..40c119e1 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -80,10 +80,6 @@ in
     };
 
     environment.systemPackages = mkMerge [
-      (attrValues {
-        inherit (pkgs) wget jq eza fd fzf ripgrep;
-      })
-
       (mkIf japanese (attrValues {
         inherit (pkgs) anki kanjidraw;
       }))
@@ -104,6 +100,9 @@ in
           ungoogled-chromium
           qbittorrent
           obs-studio
+          satty
+          aaaaxy
+          srb2
           ;
       }))
 
diff --git a/modules/packages.nix b/modules/packages.nix
index 4f23fb9a..228d01a1 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -11,60 +11,22 @@
 
     sqlcipher
 
-    fdupes
-    mediainfo
-    sox
-    httpie
-    ffmpeg
-    killall
-    trashy
-    whois
-
-    dig
-    yt-dlp
-    brightnessctl
     jpegoptim
-    playerctl
     recode
     rmlint
-    sd
     smartmontools
-    hwinfo
-    stress
-    nixpkgs-review
-    choose
-    hdparm
-    imagemagick
     restic
     watchexec
-    mpvpaper
-    timg
     ventoy
-    wf-recorder
-    diskonaut
     nodePackages.prisma
     openssl
 
     zola
-    file
-    tessen
-    wtype
-    mtr
-    cointop
     tectonic
 
     pipe-rename
     poppler_utils
-    wl-clipboard-rs
-    lnch
-    wev
-    dmenu-wayland
-    python311Packages.icoextract
-    srb2
     crystalline
-    thud
-    wallust
-    activate-linux
     tango
     nvd
     nix-init
@@ -73,8 +35,6 @@
     lychee
 
     nix-search-cli
-    satty
-    aaaaxy
     lutgen
     sudachi-rs
     pnpm-shell-completion
diff --git a/modules/shell.nix b/modules/shell.nix
index 1ee3fcc8..489c0cd0 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -30,14 +30,34 @@ in
 
     environment.systemPackages = mkMerge [
       (attrValues {
-        inherit (pkgs) wget jq eza fd fzf ripgrep;
-      })
-
-      (attrValues {
-        inherit (pkgs) treefmt;
-      })
-
-      (attrValues {
+        inherit (pkgs)
+          wget
+          jq
+          eza
+          fd
+          fzf
+          ripgrep
+          file
+          timg
+          choose
+          sd
+          ;
+        inherit (pkgs)
+          treefmt
+          httpie
+          yt-dlp
+          sox
+          dig
+          mtr
+          mediainfo
+          fdupes
+          whois
+          killall
+          trashy
+          hwinfo
+          stress
+          hdparm
+          ;
         inherit (pkgs)
           neofetch
           onefetch
@@ -48,22 +68,21 @@ in
           sanctity
           cmatrix
           ;
-      })
-      (attrValues {
         inherit (pkgs)
           gdu
           hexyl
           visidata
           zellij
+          diskonaut
           ;
-      })
-
-      (attrValues {
         inherit (pkgs)
           p7zip
           unar
           rsync
           rclone
+          ffmpeg
+          imagemagick
+          nixpkgs-review
           ;
       })