From df2355bb94a06cf30595423de12c7969fad9fe5b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 21 Oct 2018 23:20:51 +0200
Subject: [PATCH] ma tools: shuffle

---
 2configs/tools/android-pentest.nix | 2 +-
 2configs/tools/desktop.nix         | 2 +-
 2configs/tools/extra-gui.nix       | 1 -
 2configs/tools/media.nix           | 2 +-
 2configs/tools/mobility.nix        | 2 ++
 2configs/tools/secrets.nix         | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/2configs/tools/android-pentest.nix b/2configs/tools/android-pentest.nix
index da8a357..9dedafd 100644
--- a/2configs/tools/android-pentest.nix
+++ b/2configs/tools/android-pentest.nix
@@ -9,7 +9,7 @@
     dex2jar
     apktool
     jd-gui
-    android-studio
+    # android-studio
     jdk
     jre
     openssl
diff --git a/2configs/tools/desktop.nix b/2configs/tools/desktop.nix
index bb14c3e..9246688 100644
--- a/2configs/tools/desktop.nix
+++ b/2configs/tools/desktop.nix
@@ -3,7 +3,7 @@
 {
   users.users.makefu.packages = with pkgs; [
     taskwarrior
-    pass
+    (pass.withExtensions (ext: [ ext.pass-otp ]))
     gopass
     mutt
     weechat
diff --git a/2configs/tools/extra-gui.nix b/2configs/tools/extra-gui.nix
index 1c28eef..3d26cc5 100644
--- a/2configs/tools/extra-gui.nix
+++ b/2configs/tools/extra-gui.nix
@@ -6,7 +6,6 @@
     gimp
     inkscape
     libreoffice
-    quodlibet
     # skype
     synergy
     tdesktop
diff --git a/2configs/tools/media.nix b/2configs/tools/media.nix
index a61b6c8..9885506 100644
--- a/2configs/tools/media.nix
+++ b/2configs/tools/media.nix
@@ -7,7 +7,7 @@
     vlc
     mumble
     mplayer
-    quodlibet
+    quodlibet # exfalso
 
     plowshare
     streamripper
diff --git a/2configs/tools/mobility.nix b/2configs/tools/mobility.nix
index 8a559db..1115100 100644
--- a/2configs/tools/mobility.nix
+++ b/2configs/tools/mobility.nix
@@ -7,6 +7,8 @@
     rclone
     exfat
     (pkgs.callPackage ./secrets.nix {})
+
+    opensc pcsctools libu2f-host
   ];
 
   # boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
diff --git a/2configs/tools/secrets.nix b/2configs/tools/secrets.nix
index f88618c..7d10983 100644
--- a/2configs/tools/secrets.nix
+++ b/2configs/tools/secrets.nix
@@ -1,7 +1,7 @@
 { pass, write, writeDash, ... }:
 
 write "secrets" {
-  "/bin/secrets".link = writeDash "brain" ''
+  "/bin/secrets".link = writeDash "secrets" ''
     PASSWORD_STORE_DIR=$HOME/.secrets-pass/ \
     exec ${pass}/bin/pass $@
   '';