Merge branch 'master' of prism.r:stockholm

6 files changed, 8 insertions, 5 deletions

diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix
index da8a357ae..9dedafdd2 100644
--- a/makefu/2configs/tools/android-pentest.nix
+++ b/makefu/2configs/tools/android-pentest.nix
@@ -9,7 +9,7 @@
     dex2jar
     apktool
     jd-gui
-    android-studio
+    # android-studio
     jdk
     jre
     openssl
diff --git a/makefu/2configs/tools/desktop.nix b/makefu/2configs/tools/desktop.nix
index bb14c3eb5..924668803 100644
--- a/makefu/2configs/tools/desktop.nix
+++ b/makefu/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/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 1c28eeffd..3d26cc574 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -6,7 +6,6 @@
     gimp
     inkscape
     libreoffice
-    quodlibet
     # skype
     synergy
     tdesktop
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index a61b6c88e..88a7c6882 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -7,10 +7,12 @@
     vlc
     mumble
     mplayer
-    quodlibet
+    quodlibet # exfalso
 
     plowshare
     streamripper
     youtube-dl
+
+    pulseeffects
   ];
 }
diff --git a/makefu/2configs/tools/mobility.nix b/makefu/2configs/tools/mobility.nix
index 8a559dbbd..11151003d 100644
--- a/makefu/2configs/tools/mobility.nix
+++ b/makefu/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/makefu/2configs/tools/secrets.nix b/makefu/2configs/tools/secrets.nix
index f88618cbc..7d10983c7 100644
--- a/makefu/2configs/tools/secrets.nix
+++ b/makefu/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 $@
   '';