summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/tools
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-06-27 10:32:48 +0200
committerlassulus <lassulus@lassul.us>2020-06-27 10:32:48 +0200
commit9f5626098433dddacc76b48911ae4af7b5b66ddb (patch)
tree71691a924ff71aa14aacf2627bce7cd36a1fcb47 /makefu/2configs/tools
parente80ff853ad7e764956769a1d6746c80b4eb3055e (diff)
parent1ed4ded92f83e4d2f91b0b46c514acb420b7e0c3 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r--makefu/2configs/tools/android-pentest.nix2
-rw-r--r--makefu/2configs/tools/core-gui.nix1
-rw-r--r--makefu/2configs/tools/core.nix2
-rw-r--r--makefu/2configs/tools/dev.nix1
-rw-r--r--makefu/2configs/tools/extra-gui.nix1
-rw-r--r--makefu/2configs/tools/media.nix2
6 files changed, 7 insertions, 2 deletions
diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix
index 036f6e6fe..766aacb9e 100644
--- a/makefu/2configs/tools/android-pentest.nix
+++ b/makefu/2configs/tools/android-pentest.nix
@@ -7,7 +7,7 @@
nmap
msf
drozer
- dex2jar
+ #dex2jar
apktool
jd-gui
# android-studio
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index ee4f05980..95b6b0f5d 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -17,5 +17,6 @@
xdotool
xorg.xbacklight
scrot
+ libnotify
];
}
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index b4c3a431e..8339c9328 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -49,7 +49,7 @@ ${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts
populate
rxvt_unicode.terminfo
- krebspaste
+ kpaste
];
}
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index f184b5be5..276ed6cdc 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -39,5 +39,6 @@
# network related
sshuttle
pciutils
+ navi
];
}
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 49b36a5d7..aae00b97d 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -8,6 +8,7 @@
inkscape
libreoffice
# skype
+ teams
synergy
tdesktop
virtmanager
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 3f2cf3096..004222ba2 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -8,11 +8,13 @@
mumble
mplayer
# quodlibet # exfalso
+ tinymediamanager
plowshare
streamripper
youtube-dl
pulseeffects
+
];
}