diff options
| author | lassulus <lassulus@lassul.us> | 2019-03-12 11:18:05 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-03-12 11:18:05 +0100 |
| commit | d8cf96905a7598e52bfd0d52596f5edad7d7cc5f (patch) | |
| tree | d8fa08eb99de4c85cb996ac300192456dce330ce | |
| parent | dd82082d47a4b0ca727d7554d11dcf4a21a6dba0 (diff) | |
| parent | 51f21751e7e627cd8e3e7f3656eb269261d6fd06 (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | lib/types.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 7 | ||||
| -rw-r--r-- | tv/2configs/vim.nix | 9 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/types.nix b/lib/types.nix index 17c1688..45c0098 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -539,7 +539,7 @@ rec { # POSIX.1‐2013, 3.278 Portable Filename Character Set filename = mkOptionType { name = "POSIX filename"; - check = test "([0-9A-Za-z._])[0-9A-Za-z._-]*"; + check = test "[0-9A-Za-z._][0-9A-Za-z._-]*"; merge = mergeOneOption; }; diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index e18ba31..ac0a6af 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 9942ff6..a45e040 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> |