Waybar here i come (#58)

home/programs/group/basic-apps.nix

@@ -1,45 +0,0 @@
-{
-  pkgs,
-  pkgs-stable,
-  pkgs-nur-hadi,
-  ...
-}: {
-  home.packages = with pkgs-stable; [
-    vlc # Video player
-    obsidian # Note taking app
-    textpieces # Manipulate texts
-    resources # Ressource monitor
-    gnome-clocks # Clocks app
-    gnome-text-editor # Basic graphic text editor
-    ticktick # Todo app
-    pinta # Image editor
-    switcheroo # Convert images between different formats
-    onlyoffice-desktopeditors # Office suite
-    blanket # Listen to different sounds
-    signal-desktop # Messaging app
-    librewolf # Backup browser
-
-    # I love TUIs
-    caligula # User-friendly, lightweight TUI for disk imaging (ISO, USB BOOT)
-    browsh # A modern text-based browser that renders anything that a modern browser can. It runs in a terminal and can be used remotely over SSH
-    dysk # A terminal-based disk usage analyzer
-    wikiman # Offline search engine for manual pages (arch wiki, tldr)
-    tealdeer # Fast tldr client
-    sttr # Minimalist "cyberchef" like. Cross-platform, cli app to perform various operations on string
-    wiremix # Simple TUI mixer for PipeWire
-    slides # A terminal-based presentation tool that allows you to create and deliver presentations directly from the command line
-    pom # Pomodoro timer in your terminal
-    pkgs.wifitui # TUI for managing wifi
-    pkgs-nur-hadi.usbguard-tui # TUI for managing USBGuard rules
-    pkgs-nur-hadi.sheets # Terminal based spreadsheet tool
-
-    # I love CLIs
-    httpie # Command-line HTTP client, a user-friendly cURL replacement
-    gh # GitHub
-    gh-dash # A terminal dashboard for GitHub
-    figlet # Transform text into ASCII art
-    pastel # Command-line tool to generate, analyze, convert and manipulate colors
-    imagemagick # Image manipulation tool
-    chafa # Image to ANSI/Unicode converter and more.
-  ];
-}

home/programs/group/cybersecurity-packages.nix

@@ -1,35 +1,29 @@
-{
-  pkgs,
-  pkgs-stable,
-  pkgs-nur-hadi,
-}:
-(with pkgs-stable; [
+{pkgs}: (with pkgs; [
   # Web
   dirb
   ffuf
   katana
   whatweb
+  sqlmap
+  nosqli
 
   # Hashes
   hashcat
   haiti
-  hydra
   john
 
   # Databases
   mariadb
   redis
-  sqlmap
-  nosqli
 
   # Network
   inetutils
   termshark # wireshark in TUI
-  dnsrecon
   whois
   dig
   nmap
   samba
+  hydra
 
   # Misc
   metasploit
@@ -41,8 +35,6 @@
 
   # Forensics
   binwalk
-])
-++ (with pkgs-nur-hadi; [
-  spilltea
-  jwt-tui
+  pkgs.nur.repos.anotherhadi.spilltea
+  pkgs.nur.repos.anotherhadi.jwt-tui
 ])

home/programs/group/cybersecurity.nix

@@ -1,11 +1,6 @@
-{
-  pkgs,
-  pkgs-stable,
-  pkgs-nur-hadi,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = import ./cybersecurity-packages.nix {
-    inherit pkgs pkgs-stable pkgs-nur-hadi;
+    inherit pkgs;
   };
 
   systemd.user.tmpfiles.rules = [

home/programs/group/dev-packages.nix

@@ -1,17 +0,0 @@
-{
-  pkgs,
-  pkgs-stable,
-}:
-(with pkgs; [
-  go
-  claude-code
-])
-++ (with pkgs-stable; [
-  nodejs
-  air
-  duckdb
-  python3
-  jq
-  nix-prefetch-github
-  rsync
-])

home/programs/group/dev.nix

@@ -1,7 +1,20 @@
 {
   pkgs,
-  pkgs-stable,
+  pkgs-unstable,
   ...
 }: {
-  home.packages = import ./dev-packages.nix {inherit pkgs pkgs-stable;};
+  home.packages = with pkgs-unstable;
+    [
+      go
+      claude-code
+    ]
+    ++ (with pkgs; [
+      nodejs
+      air
+      duckdb
+      python3
+      jq
+      nix-prefetch-github
+      rsync
+    ]);
 }

home/programs/group/flake.nix

@@ -1,22 +0,0 @@
-{
-  inputs,
-  pkgs,
-  pkgs-stable,
-  pkgs-nur-hadi,
-  system,
-  ...
-}: let
-  devPackages = import ./dev-packages.nix {inherit pkgs pkgs-stable;};
-  cyberPackages = import ./cybersecurity-packages.nix {inherit pkgs pkgs-stable pkgs-nur-hadi;};
-in {
-  packages.${system} = {
-    dev = pkgs.buildEnv {
-      name = "dev-tools";
-      paths = devPackages;
-    };
-    cybersecurity = pkgs.buildEnv {
-      name = "cybersecurity-tools";
-      paths = cyberPackages;
-    };
-  };
-}

home/programs/group/misc.nix

@@ -1,16 +0,0 @@
-{
-  pkgs-stable,
-  pkgs-nur-hadi,
-  inputs,
-  ...
-}: {
-  home.packages = with pkgs-stable; [
-    tty-solitaire
-    bastet
-    peaclock
-    cbonsai
-    pipes
-    cmatrix
-    fastfetch
-  ];
-}