summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-11-01 13:48:38 +0100
committertv <tv@shackspace.de>2015-11-01 13:48:38 +0100
commit4d43b92b22972e663f72e2b48f5f0892aff4334a (patch)
tree8350cf4a7b8999a75ab6abd0b4839b36951f0817 /tv
parent9c36073e7b0081eaec37b0de232aeee2dcf5d8ab (diff)
tv vim: use upstream industry colors + mods
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/vim.nix55
1 files changed, 3 insertions, 52 deletions
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 74eee0a3b..f17443871 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -17,60 +17,10 @@ let
environment.variables.EDITOR = mkForce "vim";
};
- runtimepath = concatStringsSep "," [
- vim-industry-colors
- "${pkgs.vim}/share/vim/vim${majmin pkgs.vim.version}"
+ extra-runtimepath = concatStringsSep "," [
"${pkgs.vimPlugins.undotree}/share/vim-plugins/undotree"
];
- vim-industry-colors = pkgs.writeTextFile rec {
- name = "vim-industry-colors";
- destination = "/colors/${name}";
- text = ''
- " Vim color file
- " Maintainer: Shian Lee
- " Last Change: 2014 Mar 6 (for vim 7.4)
- " Remark: "industry" stands for 'industrial' color scheme. In
- " industrial HMI (Human-Machine-Interface) programming,
- " using a standard color scheme is mandatory in many cases
- " (in traffic-lights for example):
- "
- " LIGHT_RED is 'Warning'
- " LIGHT_YELLOW is 'Attention'
- " LIGHT_GREEN is 'Normal'
- " LIGHT_MAGENTA is 'Warning-Attention' (light RED-YELLOW)
- " LIGHT_CYAN is 'Attention-Normal' (light YELLOW-GREEN).
- " BLACK is Dark-High-Contrast Background for maximum safety.
- " BLUE is Shade of BLACK (not supposed to get attention).
- "
- " Industrial color scheme is by nature clear, safe and productive.
- " Yet, depends on the file type's syntax, it might appear incorrect.
-
- " Reset to dark background, then reset everything to defaults:
- set background=dark
- highlight clear
- if exists("syntax_on")
- syntax reset
- endif
-
- let colors_name = "industry"
-
- hi! Normal ctermfg=White
-
- " Syntax highlighting
- " (other color-groups using default, see :help group-name):
- hi Comment cterm=NONE ctermfg=DarkCyan gui=NONE guifg=#00aaaa
- hi Constant cterm=NONE ctermfg=LightCyan gui=NONE guifg=#00ffff
- hi Identifier cterm=NONE ctermfg=LightMagenta gui=NONE guifg=#ff00ff
- hi Function cterm=NONE ctermfg=LightGreen gui=NONE guifg=#00ff00
- hi Statement cterm=NONE ctermfg=White gui=bold guifg=#ffffff
- hi PreProc cterm=NONE ctermfg=Yellow gui=NONE guifg=#ffff00
- hi Type cterm=NONE ctermfg=LightGreen gui=bold guifg=#00ff00
- hi Special cterm=NONE ctermfg=LightRed gui=NONE guifg=#ff0000
- hi Delimiter cterm=NONE ctermfg=Yellow gui=NONE guifg=#ffff00
- '';
- };
-
vim' = pkgs.writeScriptBin "vim" ''
#! /bin/sh
set -efu
@@ -94,7 +44,7 @@ let
set mouse=a
set noruler
set pastetoggle=<INS>
- set runtimepath=${runtimepath}
+ set runtimepath=${extra-runtimepath},$VIMRUNTIME
set shortmess+=I
set showcmd
set showmatch
@@ -119,6 +69,7 @@ let
\ | hi Tabstop ctermbg=16
\ | syn match TrailingSpace containedin=ALL /\s\+$/
\ | hi TrailingSpace ctermbg=88
+ \ | hi Normal ctermfg=White
au BufRead,BufNewFile *.nix so ${pkgs.writeText "nix.vim" ''
setf nix