From cc50ee94c95f8002d2bf563de1f976d725a8a970 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 6 Jul 2023 18:49:33 +0000
Subject: [PATCH] Add some new CLI tools

---
 flake.lock        | 24 ++++++++++++------------
 sets/hacking.nix  |  3 +++
 sets/packages.nix | 10 ++++------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 73973ad..94b92b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685599623,
-        "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
+        "lastModified": 1687871164,
+        "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
+        "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1684899633,
-        "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
+        "lastModified": 1686838567,
+        "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
+        "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685865905,
-        "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
+        "lastModified": 1688594934,
+        "narHash": "sha256-3dUo20PsmUd57jVZRx5vgKyIN1tv+v/JQweZsve5q/A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
+        "rev": "e11142026e2cef35ea52c9205703823df225c947",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1685931219,
-        "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=",
+        "lastModified": 1688590700,
+        "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7409480d5c8584a1a83c422530419efe4afb0d19",
+        "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b",
         "type": "github"
       },
       "original": {
diff --git a/sets/hacking.nix b/sets/hacking.nix
index 99d3b53..f035a88 100644
--- a/sets/hacking.nix
+++ b/sets/hacking.nix
@@ -14,6 +14,9 @@
     nmap
     pwndbg
     python3Packages.binwalk-full
+
+    fusee-launcher
+    hactool
   ];
 
   users.users.artemis.extraGroups = [ "adbusers" "wireshark" ];
diff --git a/sets/packages.nix b/sets/packages.nix
index 3c6d1e4..0129f86 100644
--- a/sets/packages.nix
+++ b/sets/packages.nix
@@ -8,6 +8,7 @@
     lame
     opusTools
     pavucontrol
+    r128gain
     simple-scan
     yt-dlp
 
@@ -50,7 +51,6 @@
     gnupg
     htop
     hunspell
-    iw
     jq
     libarchive
     lsof
@@ -66,7 +66,6 @@
     rlwrap
     tmux
     tomb
-    traceroute
     tree
     unrar
     unzip
@@ -76,10 +75,12 @@
 
     # Networking
     curlFull
-    httpie
+    iw
     magic-wormhole
     mosh
+    mtr
     sshuttle
+    traceroute
     transmission-remote-gtk
     wget
 
@@ -98,7 +99,6 @@
     evince
     gnome3.eog
     gnome3.gnome-system-monitor
-    zathura
     libreoffice-fresh
 
     # Web
@@ -110,8 +110,6 @@
     gsettings-desktop-schemas
     gnome-themes-extra
     hicolor-icon-theme
-    numix-icon-theme
-    numix-icon-theme-circle
 
     # Dictionaries
   ]) ++ (with pkgs.hunspellDicts; [