From 294a62b35526036e795ba1172c90a703c7507714 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 1 Sep 2017 10:42:43 +0200
Subject: ma tools/studio: init

---
 makefu/2configs/tools/studio.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 makefu/2configs/tools/studio.nix

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
new file mode 100644
index 00000000..add021ac
--- /dev/null
+++ b/makefu/2configs/tools/studio.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  users.users.makefu.packages = with pkgs; [
+    obs-studio
+    studio-link
+    audacity
+    owncloudclient
+  ];
+}
-- 
cgit v1.2.3


From ccd81aee6533bc642c77f172eb71d711ccb88040 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 4 Sep 2017 14:37:00 +0200
Subject: ma tools: add sec-gui

---
 makefu/2configs/tools/all.nix      | 2 ++
 makefu/2configs/tools/core-gui.nix | 1 -
 makefu/2configs/tools/sec-gui.nix  | 8 ++++++++
 makefu/2configs/tools/sec.nix      | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 makefu/2configs/tools/sec-gui.nix

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 31c959d4..c7a11691 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -8,5 +8,7 @@
     ./games.nix
     ./media.nix
     ./sec.nix
+    ./sec-gui.nix
+    ./studio.nix
   ];
 }
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index f409b68a..0538647a 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -20,6 +20,5 @@
     xdotool
     xorg.xbacklight
     scrot
-    wireshark
   ];
 }
diff --git a/makefu/2configs/tools/sec-gui.nix b/makefu/2configs/tools/sec-gui.nix
new file mode 100644
index 00000000..2db3e439
--- /dev/null
+++ b/makefu/2configs/tools/sec-gui.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    tpmmanager
+    wireshark
+  ];
+}
diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index 5fb9a5fc..817cd9ea 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -13,5 +13,6 @@
     thc-hydra
     borgbackup
     ledger
+    u3_tool
   ];
 }
-- 
cgit v1.2.3


From 07b4c792224d756654f180e159a54bdccded5a08 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 4 Sep 2017 17:47:36 +0200
Subject: ma android-pentest: disable due to broken dependency

---
 makefu/2configs/tools/android-pentest.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix
index da8a357a..dec2b034 100644
--- a/makefu/2configs/tools/android-pentest.nix
+++ b/makefu/2configs/tools/android-pentest.nix
@@ -5,7 +5,8 @@
     mitmproxy
     nmap
     msf
-    drozer
+    ## broken due to protobuf
+    # drozer
     dex2jar
     apktool
     jd-gui
-- 
cgit v1.2.3


From f094ccbdd08f1c3b2413678c530986f665a1440a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 5 Sep 2017 00:01:10 +0200
Subject: ma drozer: re-enable with protbuf3_2

---
 makefu/2configs/tools/android-pentest.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'makefu/2configs/tools')

diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix
index dec2b034..da8a357a 100644
--- a/makefu/2configs/tools/android-pentest.nix
+++ b/makefu/2configs/tools/android-pentest.nix
@@ -5,8 +5,7 @@
     mitmproxy
     nmap
     msf
-    ## broken due to protobuf
-    # drozer
+    drozer
     dex2jar
     apktool
     jd-gui
-- 
cgit v1.2.3