From b3acf11a319fd41f3df2a52e8ee49927051bf297 Mon Sep 17 00:00:00 2001
From: Pedro Rey Anca <personal@peprolinbot.com>
Date: Thu, 24 Jul 2025 18:57:46 +0200
Subject: [PATCH] Organize packages and remove/change a few

---
 modules/home/default.nix   |   4 +-
 modules/home/distrobox.nix |  28 ++++++++++
 modules/home/matrix.nix    |   4 ++
 modules/home/packages.nix  | 104 +++++++++++++++----------------------
 4 files changed, 77 insertions(+), 63 deletions(-)
 create mode 100644 modules/home/distrobox.nix
 create mode 100644 modules/home/matrix.nix

diff --git a/modules/home/default.nix b/modules/home/default.nix
index e94b8d6..bbb821c 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -11,7 +11,8 @@
     ++ [(import ./cava.nix)] # audio visualizer
     ++ [(import ./cliphist.nix)] # clipboard
     ++ [(import ./direnv.nix)]
-    ++ [(import ./discord.nix)] # discord with catppuccin theme
+    ++ [(import ./discord.nix)]
+    ++ [(import ./distrobox.nix)]
     ++ [(import ./gpg.nix)] # GnuPG and its agent (gpg-agent)
     ++ [(import ./fuzzel.nix)] # launcher
     ++ [(import ./gaming.nix)] # packages related to gaming
@@ -21,6 +22,7 @@
     ++ [(import ./kdeconnect.nix)]
     ++ [(import ./kitty.nix)] # terminal
     ++ [(import ./swaync)] # notification deamon
+    ++ [(import ./matrix.nix)] # Matrix clients
     ++ [(import ./nemo.nix)] # File manager
     ++ [(import ./nextcloud.nix)] # nextcloud client
     ++ [(import ./nvim.nix)] # neovim editor
diff --git a/modules/home/distrobox.nix b/modules/home/distrobox.nix
new file mode 100644
index 0000000..581d63d
--- /dev/null
+++ b/modules/home/distrobox.nix
@@ -0,0 +1,28 @@
+{pkgs, ...}: {
+  programs.distrobox = {
+    enable = true;
+    enableSystemdUnit = true;
+    containers = {
+      debian13 = {
+        image = "debian:13";
+        entry = false;
+        additional_packages = "git";
+        init_hooks = [
+          "ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/docker"
+          "ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/docker-compose"
+        ];
+      };
+
+      kali = {
+        image = "docker.io/kalilinux/kali-rolling:latest";
+        entry = false;
+        init_hooks = [
+          "ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/docker"
+          "ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/docker-compose"
+        ];
+      };
+    };
+  };
+
+  home.packages = with pkgs; [boxbuddy];
+}
diff --git a/modules/home/matrix.nix b/modules/home/matrix.nix
new file mode 100644
index 0000000..8133f6e
--- /dev/null
+++ b/modules/home/matrix.nix
@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  programs.element-desktop.enable = true;
+  home.packages = with pkgs; [fractal];
+}
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index 2bcafde..002bf49 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -17,82 +17,62 @@
     }) ["mp4" "x-matroska" "webm"]);
 
   home.packages = with pkgs; [
-    bemoji # emoji picker
-    bitwise # cli tool for bit / hex manipulation
+    # CLI utils
     bitwarden-cli
-    distrobox
-    boxbuddy
-    evince # gnome pdf viewer
-    eza # cool ls
-    element-desktop # Matrix client
-    fd # find replacement
     file # Show file information
-    file-roller # Archive manager
-    freetube # YouTube client
-    fzf # fuzzy finder
-    gimp
-    gnome-text-editor
     gtrash # rm replacement, put deleted files in system trash
     imagemagick
-    inkscape
-    kdePackages.kleopatra # Gpg GUI
-    lazygit
-    jq
-    nitch # systhem fetch util
-    nix-prefetch-github
-    kdePackages.okular # KDE's pdf viewer/editor (supports digital signing)
-    simple-scan
-    orca-slicer
+    lazygit # Simple terminal UI for git commands
+    jq # command-line JSON processor
+    nitch # neofetch-like util
     tdf # cli pdf viewer
-    speedcrunch
-    thunderbird
     todo # cli todo list
-    toipe # typing test in the terminal
-    transmission_4-gtk # torrent client
-    vlc
-    xournalpp # For notes and pdf editing
     yazi # terminal file manager
     yt-dlp
-    zenity
-    wdisplays
-    wireguard-tools
-    wtype
+    wtype # xdotool type for wayland
+    caligula # TUI for disk imaging
+    ffmpeg
+    killall
+    man-pages # extra man pages
+    openssl
+    pamixer # pulseaudio command line mixer
+    playerctl # controller for media players
+    wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste)
+    unzip
+    wget
+    usbutils
+    gotify-cli
+
+    #GUI Utils
+    file-roller # Archive manager
+    wdisplays # Configuring displays in Wayland compositors
+    bemoji # emoji picker
+    pavucontrol # pulseaudio volume controle (GUI)
+
+    # GUI Apps
+    evince # gnome pdf viewer
+    freetube # YouTube client
+    thunderbird
+    vlc
+    mpv # video player
+    xournalpp # For notes and pdf editing
+    qbittorrent # torrent client
+    speedcrunch # Fast power user calculator
+    simple-scan
+    orca-slicer
+    kdePackages.okular # KDE's pdf viewer/editor (supports digital signing)
+    inkscape
+    kdePackages.kleopatra # GPG GUI
+    gimp
+    gnome-text-editor
+    gparted # partition manager
+    vimiv-qt # Image viewer, vim-like
 
     # Wine stuff
     winetricks
     wineWowPackages.wayland
     bottles
 
-    # C / C++
-    gcc
-    gnumake
-
-    # Python
-    python3
-
-    cmatrix
-    caligula
-    gparted # partition manager
-    ffmpeg
-    vimiv-qt # Image viewer, vim-like
-    killall
-    libnotify
-    man-pages # extra man pages
-    mpv # video player
-    openssl
-    pamixer # pulseaudio command line mixer
-    pavucontrol # pulseaudio volume controle (GUI)
-    playerctl # controller for media players
-    wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste)
-    poweralertd
-    qalculate-gtk # calculator
-    unzip
-    wget
-    xdg-utils
-    xxd
-    alejandra
-    usbutils
-
     # VPN
     wireguard-tools
     openconnect