From b46c9a05a9b88d0037f7c4b12f974dc9668aff4a Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 4 Apr 2024 20:02:51 -0400
Subject: [PATCH] meta: Continue modularizing packages

Should make it easier to know what's what.
---
 home/hyprland.nix    |  3 +++
 modules/desktop.nix  | 44 ++++++++++++++++++++++++++++----------------
 modules/packages.nix | 26 +-------------------------
 modules/shell.nix    | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/home/hyprland.nix b/home/hyprland.nix
index bb0df4bf..6699b226 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -6,9 +6,12 @@ let
 in
 {
   home.packages = with pkgs; [
+    hyprdim
     hyprnome
     hypridle
     hyprlock
+    swww
+    grimblast
   ];
 
   wayland.windowManager.hyprland = {
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 91cd7c60..44eac8ae 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -68,23 +68,35 @@ in
       gnome.gnome-keyring.enable = true;
     };
 
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = mkMerge [
+      (attrValues {
+        inherit (pkgs) wget jq eza fd fzf ripgrep;
+      })
+
+      (mkIf japanese (attrValues {
+        inherit (pkgs) anki kanjidraw;
+      }))
+
+      (mkIf bloat (attrValues {
+        inherit (pkgs)
+          logseq
+          mullvad-browser
+          spek
+          audacity
+          gimp
+          sqlitebrowser
+          qdirstat
+          libreoffice
+          krita
+          element-desktop
+          signal-desktop
+          ungoogled-chromium
+          qbittorrent
+          obs-studio
+        ;
+      }))
+
       pulseaudio
-      anki
-      kanjidraw
-      logseq
-      mullvad-browser
-      spek
-      audacity
-      gimp
-      sqlitebrowser
-      qdirstat
-      libreoffice
-      krita
-      element-desktop
-      signal-desktop
-      ungoogled-chromium
-      qbittorrent
       exo
       glib
     ];
diff --git a/modules/packages.nix b/modules/packages.nix
index e0e9a1d4..0453ab20 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -2,54 +2,39 @@
 
 {
   environment.systemPackages = with pkgs; [
-    grimblast
     osu-lazer-bin
     (pass.withExtensions (ext: with ext; [ pass-otp ]))
     pass
-    treefmt
     jamesdsp
     zbar
     sakaya.packages.${system}.sakaya
 
     sqlcipher
 
-    gdu
     fdupes
     mediainfo
-    cmatrix
     sox
     httpie
-    p7zip
-    rsync
-    unar
-    genact
     ffmpeg
     killall
     trashy
     whois
-    dwt1-shell-color-scripts
+    
     dig
     yt-dlp
-    neofetch
     brightnessctl
-    zellij
-    hexyl
     jpegoptim
     playerctl
     recode
     rmlint
     sd
     smartmontools
-    visidata
-    scc
     hwinfo
     stress
     nixpkgs-review
     choose
-    gum
     hdparm
     imagemagick
-    onefetch
     restic
     watchexec
     mpvpaper
@@ -57,7 +42,6 @@
     ventoy
     wf-recorder
     diskonaut
-    yazi
     nodePackages.prisma
     openssl
 
@@ -76,32 +60,24 @@
     wev
     dmenu-wayland
     python311Packages.icoextract
-    swww
     srb2
     crystalline
     thud
     wallust
     activate-linux
     tango
-    obs-studio
     nvd
-    hyprdim
     nix-init
     diesel-cli
     litecli
     lychee
 
-    colorpanes
-    sanctity
-    didu
-
     nix-search-cli
     satty
     aaaaxy
     lutgen
     sudachi-rs
     pnpm-shell-completion
-    rclone
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/modules/shell.nix b/modules/shell.nix
index 3c0e14a3..43b002d8 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -33,6 +33,40 @@ in
         inherit (pkgs) wget jq eza fd fzf ripgrep;
       })
 
+      (attrValues {
+        inherit (pkgs) treefmt;
+      })
+
+      (attrValues {
+        inherit (pkgs)
+          neofetch
+          onefetch
+          scc
+          genact
+          dwt1-shell-color-scripts
+          colorpanes
+          sanctity
+          cmatrix
+        ;
+      })
+      (attrValues {
+        inherit (pkgs)
+          gdu
+          hexyl
+          visidata
+          zellij
+        ;
+      })
+
+      (attrValues {
+        inherit (pkgs)
+          p7zip
+          unar
+          rsync
+          rclone
+        ;
+      })
+
       (mkIf postgres (attrValues {
         inherit (pkgs) pgcli;
       }))