From e3f843019335352f1bde6ce63b529f0e4acc5d45 Mon Sep 17 00:00:00 2001
From: Sweetbread <sweetbread@coders-squad.com>
Date: Sat, 18 Jan 2025 19:06:11 +0300
Subject: [PATCH] pkgs: Remove extra packages

---
 home-manager/packages/utils.nix    |  2 ++
 home-manager/patterns/hyprland.nix | 19 ++++++------
 nixos/packages.nix                 | 46 ------------------------------
 3 files changed, 11 insertions(+), 56 deletions(-)

diff --git a/home-manager/packages/utils.nix b/home-manager/packages/utils.nix
index 556f86b..cd8ea8f 100644
--- a/home-manager/packages/utils.nix
+++ b/home-manager/packages/utils.nix
@@ -14,5 +14,7 @@
     git-lfs
     unrar
     inputs.tlock.packages.${system}.default
+    hexyl
+    jq
   ];
 }
diff --git a/home-manager/patterns/hyprland.nix b/home-manager/patterns/hyprland.nix
index b9e079b..fc71872 100644
--- a/home-manager/patterns/hyprland.nix
+++ b/home-manager/patterns/hyprland.nix
@@ -1,13 +1,12 @@
 { pkgs, lib, config, collection, swww_flags, inputs }: {
   home.packages = with pkgs; [
-    swww
     kitty
     pamixer
     wofi
     clipse
     grimblast
-    xclip
-    clipnotify
+    wl-clipboard
+    cliphist
   ];
 
   wayland.windowManager.hyprland =
@@ -58,15 +57,15 @@
         filename = choice(listdir(folder))
 
       finally:
-        system(f"swww img {folder}/{filename} ${swww_flags}")
+        system(f"${lib.getExe pkgs.swww} img {folder}/{filename} ${swww_flags}")
     '';
 
     clipsync = pkgs.writers.writeBash "clipsync" ''
-      while clipnotify; do
-        xclip -q -sel clip -t image/png -o > /dev/null && \
-          xclip -sel clip -t image/png -o | wl-copy
-        xclip -q -sel clip -o > /dev/null && \
-          xclip -sel clip -o | wl-copy
+      while ${lib.getExe pkgs.clipnotify}; do
+        ${lib.getExe pkgs.xclip} -q -sel clip -t image/png -o > /dev/null && \
+          ${lib.getExe pkgs.xclip} -sel clip -t image/png -o | wl-copy
+        ${lib.getExe pkgs.xclip} -q -sel clip -o > /dev/null && \
+          ${lib.getExe pkgs.xclip} -sel clip -o | wl-copy
       done
     '';
   in {
@@ -132,7 +131,7 @@
 
       exec-once = [
         "systemctl --user start plasma-polkit-agent"
-        "swww init"
+        "${lib.getExe' pkgs.swww "swww-daemon"}"
         "${lib.getExe wallpaper_changer}"
         "${clipsync}"
         "clipse -listen"
diff --git a/nixos/packages.nix b/nixos/packages.nix
index e4a4f40..2cfb079 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -5,66 +5,20 @@
   };
 
   environment.systemPackages = with pkgs; [
-    # CLI utils
     file
     tree
     wget
     git
     (btop.override { cudaSupport = true; })
-    nix-index
     unzip
     yazi
-    zram-generator
     zip
-    ntfs3g
-    openssl
     lazygit
-    bluez
-    bluez-tools
     httpie
     ncdu
-    hexyl
-    jq
     tldr
-    xdg-utils
     helix
-    playerctl
-    duf
-    v2raya
-
-    # GUI utils
-    feh
-    imv
-    gromit-mpx
-    notify-desktop
-
-    # Wayland stuff
-    xwayland
-    wl-clipboard
-    cliphist
-    ueberzugpp
-
-    # WMs and stuff
-    seatd
-    waybar
-    waypaper
-    lxqt.lxqt-policykit
-    hyprcursor
-
-    # Sound
-    pipewire
-    pulseaudio
-    pamixer
-
-    # GPU stuff 
-    glaxnimate
-
-    # Other
     home-manager
-    spice-vdagent
-    libsForQt5.qtstyleplugin-kvantum
-    libsForQt5.qt5ct
-    papirus-nord
   ];
 
   fonts.packages = with pkgs; [