From 8b5a7fb02cb8fd76efa0e96fa6dc219fd35144b3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 3 May 2018 18:41:08 +0200
Subject: tv gitrepos: kops -> krops

---
 tv/2configs/gitrepos.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv')

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index c3418e7ee..a4e3aafca 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -42,7 +42,7 @@ let {
     kirk = {
       cgit.desc = "IRC tools";
     };
-    kops = {
+    krops = {
       cgit.desc = "deployment tools";
     };
     load-env = {};
-- 
cgit v1.2.3


From edafe24e94252e2be936a760ce47485c8e4fa0af Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 8 May 2018 19:25:59 +0200
Subject: tv nixpkgs: 53e6d67 -> 7cbf6ca

---
 tv/source.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tv')

diff --git a/tv/source.nix b/tv/source.nix
index e5e5e0413..14527d956 100644
--- a/tv/source.nix
+++ b/tv/source.nix
@@ -16,8 +16,7 @@ in
     {
       nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix";
       nixpkgs.git = {
-        # nixos-17.09
-        ref = mkDefault "53e6d671a9662922080635482b7e1c418d2cdc72";
+        ref = mkDefault "7cbf6ca1c84dfc917c1a99524e082fb677501844";
         url = https://github.com/NixOS/nixpkgs;
       };
       secrets.file = getAttr builder {
-- 
cgit v1.2.3


From a593d58b3d80a72f27d9ac7ca87815296b6e2121 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 9 May 2018 12:22:32 +0200
Subject: tv otpmenu: init

---
 tv/5pkgs/simple/otpmenu.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 tv/5pkgs/simple/otpmenu.nix

(limited to 'tv')

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 -
+''
-- 
cgit v1.2.3


From ce62cef3dceaa9e347d788c8d08b5d2d3e44db66 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 9 May 2018 13:40:26 +0200
Subject: tv xmonad: add otpmenu

---
 tv/5pkgs/simple/xmonad-tv/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

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)
-- 
cgit v1.2.3


From 4911be85b099ca79add6aff9ec28b7b1d36ca046 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 12 May 2018 18:51:43 +0200
Subject: tv urlwatch nixos: 17.09 -> 18.03

---
 tv/2configs/urlwatch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv')

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
-- 
cgit v1.2.3


From 5535353e8691cf95f63365f79a16752d7be457fb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 12 Jun 2018 20:30:05 +0200
Subject: tv gitrepos: add nix-writers

---
 tv/2configs/gitrepos.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

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";
     };
-- 
cgit v1.2.3