From ddbe1157c7839308cd7153dc2c0fb07bad267c80 Mon Sep 17 00:00:00 2001
From: Shahab Dogar <shahab@dogar.dev>
Date: Wed, 6 Aug 2025 05:52:56 +0500
Subject: [PATCH] chore: consolidate core and optional user packages for shahab

---
 home/shahab/common/core/default.nix           | 15 ++---------
 home/shahab/common/optional/misc-packages.nix | 26 +++----------------
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/home/shahab/common/core/default.nix b/home/shahab/common/core/default.nix
index 440df32..072c837 100644
--- a/home/shahab/common/core/default.nix
+++ b/home/shahab/common/core/default.nix
@@ -29,30 +29,20 @@
   };
 
   home.packages = with pkgs; [
-    bottom
-    lazygit
-    discord
+    nh
+    btop
     eza
     ripgrep
     rm-improved
     dust
-    gh
     zoxide
     xcp
     unzip
-    prismlauncher
     tmux
-    lazygit
     gcc
     zig
-    protonmail-desktop
-    protonvpn-gui
-    cloudflare-warp
-    kubectl
     gparted
-    k9s
     gnupg
-    postgresql_17
     dig
     bash
     dolphin
@@ -62,7 +52,6 @@
     brightnessctl
     age
     nerd-fonts.jetbrains-mono
-    obsidian
   ];
 
   nix = {
diff --git a/home/shahab/common/optional/misc-packages.nix b/home/shahab/common/optional/misc-packages.nix
index d1a4a6a..c4ab021 100644
--- a/home/shahab/common/optional/misc-packages.nix
+++ b/home/shahab/common/optional/misc-packages.nix
@@ -2,39 +2,19 @@
 
 {
   home.packages = with pkgs; [
-    nh
-    bottom
     discord
-    eza
-    ripgrep
-    rm-improved
-    dust
-    gh
-    zoxide
-    xcp
-    unzip
-    prismlauncher
     lazygit
-    gcc
-    zig
+    gh
+    prismlauncher
+    cloudflare-warp
     protonmail-desktop
     protonvpn-gui
     cloudflare-warp
     kubectl
-    gparted
     k9s
-    gnupg
     postgresql_17
-    dig
-    bash
     kitty
-    dolphin
     waybar
-    font-awesome
-    tree
-    wl-clipboard-rs
-    brightnessctl
-    age
     obsidian
   ];
 }