Merge remote-tracking branch 'gum/master'

6 files changed, 26 insertions, 5 deletions

diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 604288904..33e896d4c 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -3,9 +3,11 @@
 # tools i use when actually working with the host.
 # package version will now be maintained by nix-rebuild
 #
-# essentially `nix-env -q` of the main user
 {
   environment.systemPackages = with pkgs; [
+    ( pkgs.writeScriptBin "unknow" ''#!/bin/sh
+${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts
+    '')
     at_spi2_core
     acpi
     bc
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 0de65cceb..09ee63498 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -21,7 +21,6 @@
     gen-oath-safe
     cdrtools
     # nix related
-    nix-repl
     nix-index
     # git-related
     tig
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 3d26cc574..1c28eeffd 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -6,6 +6,7 @@
     gimp
     inkscape
     libreoffice
+    quodlibet
     # skype
     synergy
     tdesktop
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 35faaa29f..a61b6c88e 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -3,11 +3,14 @@
 {
   users.users.makefu.packages = with pkgs; [
     kodi
-    streamripper
-    youtube-dl
     calibre
     vlc
     mumble
     mplayer
+    quodlibet
+
+    plowshare
+    streamripper
+    youtube-dl
   ];
 }
diff --git a/makefu/2configs/tools/mobility.nix b/makefu/2configs/tools/mobility.nix
index 1993a5212..8a559dbbd 100644
--- a/makefu/2configs/tools/mobility.nix
+++ b/makefu/2configs/tools/mobility.nix
@@ -3,7 +3,11 @@
   users.users.makefu.packages = with pkgs;[
     go-mtpfs
     mosh
+    sshfs
+    rclone
+    exfat
+    (pkgs.callPackage ./secrets.nix {})
   ];
 
-  boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
+  # boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
 }
diff --git a/makefu/2configs/tools/secrets.nix b/makefu/2configs/tools/secrets.nix
new file mode 100644
index 000000000..f88618cbc
--- /dev/null
+++ b/makefu/2configs/tools/secrets.nix
@@ -0,0 +1,12 @@
+{ pass, write, writeDash, ... }:
+
+write "secrets" {
+  "/bin/secrets".link = writeDash "brain" ''
+    PASSWORD_STORE_DIR=$HOME/.secrets-pass/ \
+    exec ${pass}/bin/pass $@
+  '';
+  "/bin/secretsmenu".link = writeDash "secretsmenu" ''
+    PASSWORD_STORE_DIR=$HOME/.secrets-pass/ \
+    exec ${pass}/bin/passmenu $@
+  '';
+}