diff options
| author | tv <tv@krebsco.de> | 2018-10-27 15:02:39 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-10-27 15:02:39 +0200 |
| commit | 212bc39249f9792cbedf2e9a6b3fed90c52c63e7 (patch) | |
| tree | de2a5cf0be852b8beb8317481649460194f40d5b /lass/2configs/vim.nix | |
| parent | 34e1f09bf5e233bee78ee63166d2a1d9944a51f9 (diff) | |
| parent | 24f4e8dcf0eca55378fa018a9ed980625222653d (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/vim.nix')
| -rw-r--r-- | lass/2configs/vim.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 823d9a8ca..4f7bd4437 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -2,20 +2,13 @@ with import <stockholm/lib>; let - unstable_nixpkgs = import (pkgs.fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs"; - rev = "a8c71037e041725d40fbf2f3047347b6833b1703"; - sha256 = "1z4cchcw7qgjhy0x6mnz7iqvpswc2nfjpdynxc54zpm66khfrjqw"; - }) {}; out = { environment.systemPackages = [ (hiPrio vim) - pkgs.python35Packages.flake8 (pkgs.writeDashBin "govet" '' go vet "$@" '') - (hiPrio (unstable_nixpkgs.python3.withPackages (ps: [ + (hiPrio (pkgs.python3.withPackages (ps: [ ps.python-language-server ps.pyls-isort ]))) @@ -70,6 +63,8 @@ let au Syntax * syn match Garbage containedin=ALL /\s\+$/ \ | syn match TabStop containedin=ALL /\t\+/ \ | syn keyword Todo containedin=ALL TODO + \ | syn match NBSP '\%xa0' + \ | syn match NarrowNBSP '\%u202F' au BufRead,BufNewFile *.hs so ${hs.vim} @@ -135,7 +130,7 @@ let pkgs.vimPlugins.undotree pkgs.vimPlugins.vim-go pkgs.vimPlugins.fzf-vim - unstable_nixpkgs.vimPlugins.LanguageClient-neovim + pkgs.vimPlugins.LanguageClient-neovim (pkgs.vimUtils.buildVimPlugin { name = "file-line-1.0"; src = pkgs.fetchFromGitHub { @@ -172,6 +167,8 @@ let hi Garbage ctermbg=088 hi TabStop ctermbg=016 + hi NBSP ctermbg=094 + hi NarrowNBSP ctermbg=097 hi Todo ctermfg=174 ctermbg=NONE hi NixCode ctermfg=148 |