summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-03-12 11:18:05 +0100
committerlassulus <lassulus@lassul.us>2019-03-12 11:18:05 +0100
commita56a2ef0083653a0c0d5c6339857878521958b5d (patch)
treeb81a6a64b916464bd9702f153e852b48d59c167d /tv/2configs
parentc4ebcc43d2b2f2451b16ee453f5275bd46018cd4 (diff)
parent4b7673a6a7f221119883ec043519b2f7323779e1 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/default.nix7
-rw-r--r--tv/2configs/vim.nix9
2 files changed, 8 insertions, 8 deletions
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 = {
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 9942ff65b..a45e040e6 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
@@ -346,6 +347,7 @@ let {
(writerName ''\([^"]*\.\)\?vimrc'')
];
xdefaults = {};
+ xmodmap = {};
}))}
" Clear syntax that interferes with nixINSIDE_DOLLAR_CURLY.
@@ -391,6 +393,9 @@ let {
\ matchgroup=sedSemicolon end=";\|$"
\ contains=sedWhitespace
'';
+ "/syntax/xmodmap.vim".text = ''
+ syn match xmodmapComment /^\s*!.*/
+ '';
}))
];
@@ -485,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>