From 922e916a7af161ac326bdcd6e6e85edf147ddd27 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Tue, 26 May 2026 20:45:40 +0200
Subject: [PATCH] edit packages list

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
---
 home/programs/group/basic-apps.nix            |  9 +--
 .../programs/group/cybersecurity-packages.nix | 39 ++++++++++++
 home/programs/group/cybersecurity.nix         | 40 ++-----------
 home/programs/group/dev-packages.nix          | 22 +++++++
 home/programs/group/dev.nix                   | 22 ++-----
 home/programs/group/flake.nix                 | 60 ++-----------------
 6 files changed, 77 insertions(+), 115 deletions(-)
 create mode 100644 home/programs/group/cybersecurity-packages.nix
 create mode 100644 home/programs/group/dev-packages.nix

diff --git a/home/programs/group/basic-apps.nix b/home/programs/group/basic-apps.nix
index 3f79944..f4753a0 100644
--- a/home/programs/group/basic-apps.nix
+++ b/home/programs/group/basic-apps.nix
@@ -1,11 +1,6 @@
-{
-  pkgs,
-  pkgs-stable,
-  ...
-}: {
+{pkgs-stable, ...}: {
   home.packages = with pkgs-stable; [
     vlc # Video player
-    blanket # White-noise app
     obsidian # Note taking app
     textpieces # Manipulate texts
     resources # Ressource monitor
@@ -16,6 +11,6 @@
     onlyoffice-desktopeditors # Office suite
 
     signal-desktop # Messaging app
-    element-desktop # Messaging app
+    librewolf
   ];
 }
diff --git a/home/programs/group/cybersecurity-packages.nix b/home/programs/group/cybersecurity-packages.nix
new file mode 100644
index 0000000..8703c32
--- /dev/null
+++ b/home/programs/group/cybersecurity-packages.nix
@@ -0,0 +1,39 @@
+{
+  pkgs,
+  pkgs-stable,
+  inputs,
+  system,
+}:
+(with pkgs-stable; [
+  httpie
+  trufflehog
+  sttr
+  wireshark
+  nmap
+  john
+  hashcat
+  metasploit
+  haiti
+  hydra
+  dnsrecon
+  whois
+  dig
+  nosqli
+  jwt-cli
+  nuclei
+  caido
+  gobuster
+  dirb
+  ffuf
+  sqlmap
+  katana
+  inetutils
+  samba
+  openvpn
+  mariadb
+  redis
+])
+++ [
+  inputs.spilltea.packages.${system}.default
+  inputs.jwt-tui.packages.${system}.default
+]
diff --git a/home/programs/group/cybersecurity.nix b/home/programs/group/cybersecurity.nix
index 940e094..4e00659 100644
--- a/home/programs/group/cybersecurity.nix
+++ b/home/programs/group/cybersecurity.nix
@@ -4,42 +4,10 @@
   pkgs,
   ...
 }: {
-  home.packages = with pkgs-stable; [
-    httpie
-    trufflehog
-    sttr
-    wireshark
-    nmap
-    john
-    hashcat
-    metasploit
-    haiti
-    hydra
-    dnsrecon
-    whois
-    dig
-    nosqli
-    jwt-cli
-    nuclei
-
-    # Web
-    inputs.spilltea.packages.${pkgs.system}.default
-    inputs.jwt-tui.packages.${pkgs.system}.default
-    caido
-    nuclei
-    gobuster
-    dirb
-    ffuf
-    sqlmap
-    katana
-
-    # Utils
-    inetutils
-    samba
-    openvpn
-    mariadb
-    redis
-  ];
+  home.packages = import ./cybersecurity-packages.nix {
+    inherit pkgs pkgs-stable inputs;
+    system = pkgs.stdenv.hostPlatform.system;
+  };
 
   systemd.user.tmpfiles.rules = [
     "d %h/Cyber/tmp 0755 - - -"
diff --git a/home/programs/group/dev-packages.nix b/home/programs/group/dev-packages.nix
new file mode 100644
index 0000000..8ce1ce8
--- /dev/null
+++ b/home/programs/group/dev-packages.nix
@@ -0,0 +1,22 @@
+{
+  pkgs,
+  pkgs-stable,
+  inputs,
+  system,
+}:
+(with pkgs; [
+  go
+  bun
+  nodejs
+  claude-code
+  inputs.bun2nix.packages.${system}.default
+])
+++ (with pkgs-stable; [
+  air
+  duckdb
+  docker
+  python3
+  jq
+  just
+  nix-prefetch-github
+])
diff --git a/home/programs/group/dev.nix b/home/programs/group/dev.nix
index 7b0ea85..b27d4c6 100644
--- a/home/programs/group/dev.nix
+++ b/home/programs/group/dev.nix
@@ -4,22 +4,8 @@
   inputs,
   ...
 }: {
-  home.packages =
-    (with pkgs; [
-      # Unstable: latest toolchain versions preferred for dev
-      go
-      bun
-      nodejs
-      claude-code
-      inputs.bun2nix.packages.${stdenv.hostPlatform.system}.default
-    ])
-    ++ (with pkgs-stable; [
-      air
-      duckdb
-      docker
-      python3
-      jq
-      just
-      nix-prefetch-github
-    ]);
+  home.packages = import ./dev-packages.nix {
+    inherit pkgs pkgs-stable inputs;
+    system = pkgs.stdenv.hostPlatform.system;
+  };
 }
diff --git a/home/programs/group/flake.nix b/home/programs/group/flake.nix
index 340dd14..e557b5a 100644
--- a/home/programs/group/flake.nix
+++ b/home/programs/group/flake.nix
@@ -4,66 +4,18 @@
   pkgs-stable,
   system,
   ...
-}: {
+}: let
+  devPackages = import ./dev-packages.nix {inherit pkgs pkgs-stable inputs system;};
+  cyberPackages = import ./cybersecurity-packages.nix {inherit pkgs pkgs-stable inputs system;};
+in {
   packages.${system} = {
     dev = pkgs.buildEnv {
       name = "dev-tools";
-      paths =
-        (with pkgs; [
-          go
-          bun
-          nodejs
-          air
-          duckdb
-          claude-code
-          inputs.bun2nix.packages.${system}.default
-        ])
-        ++ (with pkgs-stable; [
-          docker
-          python3
-          jq
-          just
-        ]);
+      paths = devPackages;
     };
-
     cybersecurity = pkgs.buildEnv {
       name = "cybersecurity-tools";
-      paths = with pkgs-stable; [
-        wireshark
-        nmap
-        john
-        hashcat
-        metasploit
-        haiti
-        hydra
-        dnsrecon
-        whois
-        dig
-        nosqli
-        jwt-cli
-        nuclei
-        caido
-        gobuster
-        dirb
-        ffuf
-        sqlmap
-        inetutils
-        samba
-        openvpn
-        mariadb
-        redis
-      ];
-    };
-  };
-
-  homeManagerModules = {
-    dev = {
-      _module.args.pkgs-stable = pkgs-stable;
-      imports = [./dev.nix];
-    };
-    cybersecurity = {
-      _module.args.pkgs-stable = pkgs-stable;
-      imports = [./cybersecurity.nix];
+      paths = cyberPackages;
     };
   };
 }