6 files changed, 34 insertions, 15 deletions
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 8a15ae2e7..7e9a459c3 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -5,38 +5,44 @@
 #
 # essentially `nix-env -q` of the main user
 {
-  krebs.per-user.makefu.packages = with pkgs; [
+  environment.systemPackages = with pkgs; [
     at_spi2_core
     acpi
     bc
     rsync
     exif
     file
+    lsof
+    which
+    binutils
+
     # fs
-    ntfs3g
+    cifs-utils
     dosfstools
+    ntfs3g
+    smartmontools
+
+    # io
     pv
     sshpass
     usbutils
     p7zip
     hdparm
+
+    # net
+    wget
+    curl
     inetutils
     ncftp
-    mutt
     tcpdump
     sysstat
-    which
-    weechat
     wol
-    tmux
     iftop
+
     mkpasswd
-    # storage
-    smartmontools
-    cifs-utils
-    # net
-    wget
-    curl
+    mutt
+    weechat
+    tmux
 
     # stockholm
     git
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index d3d50c433..26e9808b2 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -2,7 +2,8 @@
 
 {
   users.users.makefu.packages = with pkgs;[
-    python35Packages.virtualenv
+    python3Packages.virtualenv
+    python3Packages.pyserial
     # embedded
     gi
     flashrom
@@ -12,10 +13,12 @@
     esptool
     cac-api
     cac-panel
+    krebszones
     ovh-zone
     whatsupnix
     brain
     gen-oath-safe
     cdrtools
+    stockholm
   ];
 }
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index bcc068d82..e25290297 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -14,5 +14,6 @@
     saleae-logic
     arduino-user-env
     gitAndTools.gitFull
+    signal-desktop
   ];
 }
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 8e815da5e..40ea4523d 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -6,5 +6,7 @@
   ];
   users.users.makefu.packages = with pkgs; [
     games-user-env
+    wine
+    pkg2zip
   ];
 }
diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index 817cd9ead..3dc02937d 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -13,6 +13,6 @@
     thc-hydra
     borgbackup
     ledger
-    u3_tool
+    u3-tool
   ];
 }
diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
index add021acd..0356ba391 100644
--- a/makefu/2configs/tools/studio.nix
+++ b/makefu/2configs/tools/studio.nix
@@ -5,6 +5,13 @@
     obs-studio
     studio-link
     audacity
-    owncloudclient
+    darkice
+    # owncloudclient
+    (pkgs.writeScriptBin "prepare-pulseaudio" ''
+      pactl load-module module-null-sink sink_name=stream sink_properties=device.description="Streaming"
+      pactl load-module module-loopback source=alsa_output.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo.monitor sink=stream latency_msec=1
+      pactl load-module module-loopback source=alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo sink=stream latency_msec=1
+      darkice -c ~/lol.conf
+    '')
   ];
 }