From 640be8c1128964337e32926a07ea1210ae5ed61a Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 3 Oct 2023 15:25:34 -0400
Subject: [PATCH] refactor(nix): move around some packages to organize better

---
 nixos/home/hyprland.nix |  46 ++++++++++++--
 nixos/home/packages.nix | 136 +++++++++++++++-------------------------
 nixos/home/theme.nix    |   5 ++
 3 files changed, 96 insertions(+), 91 deletions(-)

diff --git a/nixos/home/hyprland.nix b/nixos/home/hyprland.nix
index c0866f09..224a59cf 100644
--- a/nixos/home/hyprland.nix
+++ b/nixos/home/hyprland.nix
@@ -6,11 +6,6 @@
   polkit = pkgs.plasma5Packages.polkit-kde-agent;
 in
 {
-  home.packages = with pkgs; [
-    sassc
-    coloryou
-  ];
-
   imports = [
     ags.homeManagerModules.default
   ];
@@ -51,4 +46,45 @@ in
     "hypr/main.conf".source       = symlink "${configDir}/hypr/main.conf";
     "hypr/hyprpaper.conf".source  = symlink "${configDir}/hypr/hyprpaper.conf";
   };
+
+  home.packages = with pkgs; [
+    # ags
+    sassc
+    coloryou
+    libnotify
+    playerctl
+    bluez-tools
+    brightnessctl
+    pulseaudio
+    libinput
+
+    ## gui
+    pavucontrol # TODO: replace with ags widget
+    networkmanagerapplet # TODO: replace with ags widget
+    blueberry # TODO: replace with ags widget
+
+
+    # Hyprland
+    hyprpaper
+    swayidle
+    lisgd
+    swayosd
+    squeekboard
+    xclip
+    wl-clipboard
+    cliphist
+
+    ## gui
+    gtklock
+    wl-color-picker # TODO: add bind for this in hyprland
+    grim
+    slurp
+    swappy
+
+    ## libs
+    libayatana-appindicator
+    xdg-utils
+    evtest
+    glib
+  ];
 }
diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix
index b2e7d124..a49c1591 100644
--- a/nixos/home/packages.nix
+++ b/nixos/home/packages.nix
@@ -24,27 +24,10 @@
     };
   };
 
-  xdg.desktopEntries.gparted = {
-    name = "GParted";
-    genericName = "Partition Editor";
-    comment = "Create, reorganize, and delete partitions";
-    exec = "Gparted";
-    icon = "gparted";
-    terminal = false;
-    type = "Application";
-    categories = [ "GNOME" "System" "Filesystem" ];
-    startupNotify = true;
-    settings = {
-      Keywords = "Partition";
-      X-GNOME-FullName = "GParted Partition Editor";
-    };
-  };
-
   home.packages = with pkgs;
     (with python311Packages; [
       python
       pyclip
-      gdown
 
     ]) ++
     (with nodePackages; [
@@ -53,7 +36,6 @@
     ]) ++
     (with plasma5Packages; [
       polkit-kde-agent
-      qtstyleplugin-kvantum
       ark
       kcharselect
       kdenlive
@@ -76,6 +58,40 @@
 
     ]) ++ [
 
+    # School
+    virt-manager
+    gradle
+    gradle-completion # FIXME: not working
+    #camunda-modeler
+
+    # Misc Apps
+    thunderbird # TODO: use programs.thunderbird
+    firefox # TODO: use programs.firefox
+    spotifywm
+    zeal
+    libreoffice-fresh # TODO: add spelling stuff
+    photoqt
+    gimp-with-plugins
+    vlc
+    discord
+    nextcloud-client
+
+    # Misc CLI
+    neofetch
+    qt5.qtwayland
+    qt6.qtwayland
+    acpi
+    progress
+    alsa-utils
+    wget
+    tree
+    mosh
+    rsync
+    killall
+    fontfor
+    imagemagick
+    usbutils
+
     (writeShellScriptBin "Gparted" ''
       (
         sleep 1.5
@@ -87,75 +103,23 @@
           fi
         done
       ) &
-
       exec env SUDO_ASKPASS=${pkgs.plasma5Packages.ksshaskpass}/bin/${pkgs.plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@"
     '')
-
-    # School
-    virt-manager
-    gradle
-    gradle-completion # not working
-    #camunda-modeler
-
-    protonmail-bridge
-    thunderbird
-    input-emulator
-    bc
-    spotifywm
-    swayosd
-    blueberry
-    libayatana-appindicator
-    libnotify
-    libinput
-    playerctl
-    steam-run
-    wineWowPackages.stable
-    cabextract
-    qt5.qtwayland
-    qt6.qtwayland
-    bottles-unwrapped
-    zscroll
-    lisgd
-    zeal
-    acpi
-    libreoffice-fresh # TODO: add spelling stuff
-    neofetch
-    photoqt
-    progress
-    wl-color-picker # add bind for this in hyprland
-    xclip
-    xdg-utils
-    pavucontrol # TODO: open on left click
-    gimp-with-plugins
-    bluez-tools
-    vlc
-    discord
-    brightnessctl
-    pulseaudio
-    alsa-utils
-    wget
-    firefox
-    tree
-    mosh
-    rsync
-    killall
-    hyprpaper
-    networkmanagerapplet
-    nextcloud-client
-    swayidle
-    wl-clipboard
-    cliphist
-    gtklock
-    grim
-    slurp
-    swappy
-    fontfor
-    qt5ct
-    imagemagick
-    usbutils
-    evtest
-    squeekboard
-    glib
-    appimage-run
   ];
+
+  xdg.desktopEntries.gparted = {
+    name = "GParted";
+    genericName = "Partition Editor";
+    comment = "Create, reorganize, and delete partitions";
+    exec = "Gparted";
+    icon = "gparted";
+    terminal = false;
+    type = "Application";
+    categories = [ "GNOME" "System" "Filesystem" ];
+    startupNotify = true;
+    settings = {
+      Keywords = "Partition";
+      X-GNOME-FullName = "GParted Partition Editor";
+    };
+  };
 }
diff --git a/nixos/home/theme.nix b/nixos/home/theme.nix
index 571b6a6d..28d9a84a 100644
--- a/nixos/home/theme.nix
+++ b/nixos/home/theme.nix
@@ -7,6 +7,11 @@
   };
 in
 {
+  home.packages = with pkgs; [
+    plasma5Packages.qtstyleplugin-kvantum
+    qt5ct
+  ];
+
   home.pointerCursor = {
     name = "Dracula-cursors";
     package = pkgs.dracula-theme;