From 6f6e18d22fe8cacbd9567bcebd092f07f27716e8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 16 Feb 2019 18:49:26 +0100
Subject: Revert "brscan4: init at 0.4.4-4"

This reverts commit 1993cbc42114c759a47fed8de1e73980d3df57d9.
---
 tv/5pkgs/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tv')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 605d827ef..1b2982427 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -13,6 +13,14 @@ foldl' mergeAttrs {}
 //
 
 {
+  brscan4 = overrideDerivation super.brscan4 (original: rec {
+    name = "brscan4-0.4.4-4";
+    src = super.fetchurl {
+      url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
+      sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
+    };
+  });
+
   # TODO use XDG_RUNTIME_DIR?
   cr = self.writeDashBin "cr" ''
     set -efu
-- 
cgit v1.2.3


From eef0b6e4790f6cf0773d0dddb730769588146417 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 16 Feb 2019 18:51:59 +0100
Subject: Revert "tv brscan4: init at 0.4.4-4"

This reverts commit aa5bccf9e3f49b7e0aaef541a54e5ff58f89fcf7.
---
 tv/5pkgs/default.nix | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'tv')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 1b2982427..605d827ef 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -13,14 +13,6 @@ foldl' mergeAttrs {}
 //
 
 {
-  brscan4 = overrideDerivation super.brscan4 (original: rec {
-    name = "brscan4-0.4.4-4";
-    src = super.fetchurl {
-      url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
-      sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
-    };
-  });
-
   # TODO use XDG_RUNTIME_DIR?
   cr = self.writeDashBin "cr" ''
     set -efu
-- 
cgit v1.2.3


From 8791713f205c99121b083d2f495114baed29c1ee Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 16 Feb 2019 19:22:24 +0100
Subject: Revert "tv: add deploy alias"

This reverts commit edeb11956553242749a35c9459b45c7bb079881e.
---
 tv/2configs/default.nix | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index e18ba31b0..ac0a6af4d 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -80,13 +80,6 @@ with import <stockholm/lib>;
         ls = "ls -h --color=auto --group-directories-first";
         dmesg = "dmesg -L --reltime";
         view = "vim -R";
-
-        deploy = pkgs.writeDash "deploy" ''
-          set -eu
-          cd ~/stockholm
-          export SYSTEM="$1"
-          exec nix-shell -I stockholm="$PWD" --run 'deploy --system="$SYSTEM"'
-        '';
       };
 
       environment.variables = {
-- 
cgit v1.2.3


From cfb756c7b10408d1de5dfc5c4eb7742b10ee4f55 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 16 Feb 2019 19:29:25 +0100
Subject: tv vim: add todoComment

---
 tv/2configs/vim.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tv')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 9942ff65b..20e1d650f 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -151,7 +151,7 @@ let {
         setlocal foldmethod=syntax
       '';
       "/syntax/todo.vim".text = ''
-        syn match Comment /#.*/
+        syn match todoComment /#.*/
 
         syn match todoDate /^[1-9]\S*/
           \ nextgroup=todoSummary
@@ -173,6 +173,7 @@ let {
 
         syn sync minlines=1000
 
+        hi link todoComment Comment
         hi todoDate ctermfg=255
         hi todoSummary ctermfg=229
         hi todoBlock ctermfg=248
-- 
cgit v1.2.3


From fc1e69f9d13e28e3bceb8bfd1733b87cc6e57174 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 16 Feb 2019 19:29:40 +0100
Subject: tv vim: add xmodmap

---
 tv/2configs/vim.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tv')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 20e1d650f..2dd2e742b 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -347,6 +347,7 @@ let {
             (writerName ''\([^"]*\.\)\?vimrc'')
           ];
           xdefaults = {};
+          xmodmap = {};
         }))}
 
         " Clear syntax that interferes with nixINSIDE_DOLLAR_CURLY.
@@ -392,6 +393,9 @@ let {
           \ matchgroup=sedSemicolon end=";\|$"
           \ contains=sedWhitespace
       '';
+      "/syntax/xmodmap.vim".text = ''
+        syn match xmodmapComment /^\s*!.*/
+      '';
     }))
   ];
 
-- 
cgit v1.2.3


From 6da86a30a99aed3819af07e2ecb781c17669411c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 16 Feb 2019 19:30:37 +0100
Subject: tv vim: map <f3> :ShowSyntax

---
 tv/2configs/vim.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tv')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 2dd2e742b..a45e040e6 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -490,6 +490,8 @@ let {
     inoremap <f1> <esc>:tabp<cr>
     inoremap <f2> <esc>:tabn<cr>
 
+    noremap <f3> :ShowSyntax<cr>
+
     " <C-{Up,Down,Right,Left>
     noremap <esc>Oa <nop> | noremap! <esc>Oa <nop>
     noremap <esc>Ob <nop> | noremap! <esc>Ob <nop>
-- 
cgit v1.2.3