diff options
author | tv <tv@krebsco.de> | 2021-06-10 21:42:06 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2021-06-10 21:42:06 +0200 |
commit | 0e6e8b7188b4a2aab7ca467cb20514a70ba09011 (patch) | |
tree | cfa9ab8a1a83e0dd139255cf7f7b29bf9a37fdf6 /makefu/2configs/tools | |
parent | 44c4cb6a453f5bc34c870caa6802548c099e9435 (diff) | |
parent | 04a081a3be600cc5e74aadd4f0fee899d6987a85 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r-- | makefu/2configs/tools/extra-gui.nix | 3 | ||||
-rw-r--r-- | makefu/2configs/tools/media.nix | 2 | ||||
-rw-r--r-- | makefu/2configs/tools/sec.nix | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix index 5a29eea85..763603dfd 100644 --- a/makefu/2configs/tools/extra-gui.nix +++ b/makefu/2configs/tools/extra-gui.nix @@ -16,7 +16,10 @@ saleae-logic gitAndTools.gitFull signal-desktop + element-desktop # rambox + vscode + chitubox ]; } diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix index d66ea7760..14e782e3f 100644 --- a/makefu/2configs/tools/media.nix +++ b/makefu/2configs/tools/media.nix @@ -15,6 +15,6 @@ streamripper youtube-dl - pulseeffects + pulseeffects-legacy # for pulse ]; } diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix index 17a980ef7..acc22d647 100644 --- a/makefu/2configs/tools/sec.nix +++ b/makefu/2configs/tools/sec.nix @@ -4,7 +4,7 @@ users.users.makefu.packages = with pkgs; [ aria2 # mitmproxy - pythonPackages.binwalk-full + python3Packages.binwalk-full dnsmasq iodine mtr |