summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-06-14 21:54:55 +0200
committermakefu <github@syntax-fehler.de>2018-06-14 21:54:55 +0200
commitd98e41a4d70755b10d123678250bb6353b53b5bd (patch)
treeb64f54fcba0bcf31b4962632803634a57b5df0a7 /tv
parent8cad4d187446901206e8110d27d1763c2df942d2 (diff)
parent006a3174eccecfee96e7b4fb9c818043a0334535 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/gitrepos.nix1
-rw-r--r--tv/2configs/urlwatch.nix2
-rw-r--r--tv/5pkgs/simple/otpmenu.nix15
-rw-r--r--tv/5pkgs/simple/xmonad-tv/default.nix1
4 files changed, 18 insertions, 1 deletions
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index a4e3aafca..6e4830a77 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -54,6 +54,7 @@ let {
netcup = {
cgit.desc = "netcup command line interface";
};
+ nix-writers = {};
populate = {
cgit.desc = "source code installer";
};
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 897def8c9..aa71be777 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -34,7 +34,7 @@ with import <stockholm/lib>;
## other
- https://nixos.org/channels/nixos-17.09/git-revision
+ https://nixos.org/channels/nixos-18.03/git-revision
https://nixos.org/channels/nixos-unstable/git-revision
## 2014-10-17
diff --git a/tv/5pkgs/simple/otpmenu.nix b/tv/5pkgs/simple/otpmenu.nix
new file mode 100644
index 000000000..b35e1601f
--- /dev/null
+++ b/tv/5pkgs/simple/otpmenu.nix
@@ -0,0 +1,15 @@
+{ dmenu, gnused, pass, writeDashBin, xdotool }:
+
+writeDashBin "otpmenu" ''
+ set -efu
+
+ x=$(
+ ${pass}/bin/pass git ls-files '*/otp.gpg' \
+ | ${gnused}/bin/sed 's:/otp\.gpg$::' \
+ | ${dmenu}/bin/dmenu -f -p OTP
+ )
+
+ otp=$(${pass}/bin/pass otp code "$x/otp")
+
+ printf %s "$otp" | ${xdotool}/bin/xdotool type -f -
+''
diff --git a/tv/5pkgs/simple/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix
index d474b7edd..cb59e8517 100644
--- a/tv/5pkgs/simple/xmonad-tv/default.nix
+++ b/tv/5pkgs/simple/xmonad-tv/default.nix
@@ -133,6 +133,7 @@ myKeys conf = Map.fromList $
[ ((_4 , xK_Escape ), forkFile "/run/wrappers/bin/slock" [] Nothing)
, ((_4S , xK_c ), kill)
+ , ((_4 , xK_o ), forkFile "${pkgs.otpmenu}/bin/otpmenu" [] Nothing)
, ((_4 , xK_p ), forkFile "${pkgs.pass}/bin/passmenu" ["--type"] Nothing)
, ((_4 , xK_x ), chooseAction spawnTermAt)