From 797fbb0d35bb9543188d2cb0c5ed3b092302e359 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Wed, 22 Feb 2023 00:05:01 +0100
Subject: [PATCH] programs: Clean up

This removes some unused tools, changes the categorisation and moves
some packages into modules that better fit them.
---
 users/simon/modules/git.nix         |  4 ++++
 users/simon/modules/programs.nix    | 31 +++++++++--------------------
 users/simon/modules/zsh/default.nix |  1 +
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/users/simon/modules/git.nix b/users/simon/modules/git.nix
index b0f7a53..3dac3d1 100644
--- a/users/simon/modules/git.nix
+++ b/users/simon/modules/git.nix
@@ -102,4 +102,8 @@
       "vueko.sbruder.de:587".target = "sbruder.de/mail";
     };
   };
+
+  home.packages = with pkgs; [
+    gitAndTools.pre-commit # pre-commit hook helper
+  ];
 }
diff --git a/users/simon/modules/programs.nix b/users/simon/modules/programs.nix
index 0321f0b..8773399 100644
--- a/users/simon/modules/programs.nix
+++ b/users/simon/modules/programs.nix
@@ -32,7 +32,6 @@ in
 
     # unix tools on steroids
     du-dust # intuitive du
-    exa # better ls
     fd # better find
     ripgrep # better grep
 
@@ -41,7 +40,6 @@ in
     hexyl # user friendly hex file viewer
     hyperfine # cli benchmarking
     mktorrent # bittorrent seed file generator
-    qrencode # qr code generator
     rclone # rsync for cloud storage
     tokei # fast cloc
     xdelta # binary diff
@@ -53,18 +51,15 @@ in
 
     # network tools
     dnsutils # dig
-    dogdns # better dig
     miniserve # small http server
     sshfs # mount remote host
     vnstat # client for vnstatd
     whois # whois client
-    zmap # scanner for large address spaces
 
     # system tools
     libva-utils # vainfo
 
     # clients
-    hcloud # cli for Hetzner Cloud
     libnotify # notify-send
 
     # function eye candy
@@ -76,8 +71,7 @@ in
 
     # passwords
     mkpasswd # crypt frontend
-    pwgen
-    pwgen-secure # password generator
+    pwgen # password generator
     xkcdpass # memorable password generator
 
     # misc
@@ -86,9 +80,6 @@ in
     python3Packages.ipython # better python repl (useful for one-liners)
     toilet # free figlet
 
-    # git
-    gitAndTools.pre-commit # pre-commit hook for git
-
     # nix tools
     nixpkgs-fmt # format nix expressions
     nixpkgs-review # review nixpkgs pull request
@@ -112,12 +103,9 @@ in
 
     # images
     exiftool # manipulate EXIF meta data
-    gallery-dl # image gallery downloader
     jpegoptim # lossless jpeg optimiser
     libwebp # tools for webp image format
     oxipng # lossless png optimiser
-    pngcrush
-    pngquant # lossy png optimisers
 
     # documents
     mupdf # document (pdf) viewer and tools
@@ -126,8 +114,7 @@ in
     mkvtoolnix-cli # matroska (de-)muxing
   ] ++ lib.optionals nixosConfig.sbruder.gui.enable [
     # communication
-    claws-mail # email client that looks ugly but just works
-    firefox-esr # a bad browser
+    linphone # sip softphone
     mumble # VoIP group chat
 
     # creative/design
@@ -135,7 +122,6 @@ in
     inkscape # vector graphics editor
 
     # audio and video
-    libbluray # includes command line tools
     mkvtoolnix # matroska (de-)muxing with gui
     wf-recorder # wlroots screen recorder
 
@@ -145,21 +131,17 @@ in
     # office
     aspellDicts.de
     aspellDicts.en
-    gnome.evince # pdf viewer
     gnucash # bookkeeping
     hunspellDicts.de-de
     hunspellDicts.en-gb-ise # dictionary
     libreoffice # office suite
-    linphone # sip softphone
-    rnote # notebook
     xournalpp # notebook
-    xsane # scanning tool
 
     # tools
-    antimicroX # gamepad to keyboard/mouse mapping
     filezilla # ftp client
     gparted # gui for parted
     qalculate-gtk # flexible calculator
+    qrencode # qr code generator
     remmina # remote desktop client
     scrcpy # stream/control android phones over adb
     v4l-utils # video4linux configuration
@@ -170,8 +152,12 @@ in
     gdb # debugger (for coredumpctl debug)
     gdrive # cli downloader for google drive
     (ripgrep-all.overrideAttrs (o: { tesseract = tesseract.override { enableLanguages = [ "deu" "eng" ]; }; })) # ripgrep for complex (binary) files
+
+    # audio and video
+    libbluray # includes command line tools
   ] ++ lib.optionals (nixosConfig.sbruder.gui.enable && nixosConfig.sbruder.full) [
     # communication
+    firefox-esr # a bad browser
     ungoogled-chromium # for most webrtc applications and for cross-browser testing
 
     # creative/design
@@ -185,9 +171,10 @@ in
     picard # musicbrainz tagger
 
     # office
+    gnome.evince # pdf viewer
     jameica # application framework (used for hibiscus online banking)
     pdfarranger # pdf multitool
-    textidote # LaTeX document linter
+    rnote # notebook
   ] ++ lib.optionals (nixosConfig.sbruder.gui.enable && !nixosConfig.sbruder.full) [
     # creative/design
     gimp # without plugins
diff --git a/users/simon/modules/zsh/default.nix b/users/simon/modules/zsh/default.nix
index 62ab306..16065c4 100644
--- a/users/simon/modules/zsh/default.nix
+++ b/users/simon/modules/zsh/default.nix
@@ -56,6 +56,7 @@ in
         enable = true;
       };
     };
+    exa.enable = true;
     nix-index.enable = true;
     starship = {
       enable = true;