From 1f6270da038fe0142c4bc5e8f92386c1ed000bc7 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 c3418e7..a4e3aaf 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 f74a1e121dfc69dfca92c1e83c3abcc20c81b5a8 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 e5e5e04..14527d9 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 7208c2149243dae83ae00da8229e4dafa11329f1 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 0000000..b35e160
--- /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 15802fb477f51c580c10ee98f69cab310d769bee 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 d474b7e..cb59e85 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 7e8d0b67a5d3d96986e5fe6541ad9f28406c44f8 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 897def8..aa71be7 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 d633848269a6ef23bb1ad7120c148070cd2f511d 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 a4e3aaf..6e4830a 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