diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2016-12-08 17:11:57 +0100 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2016-12-08 17:16:18 +0100 |
| commit | 82963173a6b07039b084e918f72057312974a3ba (patch) | |
| tree | ca1a2f93a5d66b7ef7012019c0975edcdad38493 | |
| parent | 5adce3bcbd24d2e240a27a07e9ce7e863b126dde (diff) | |
| download | dotfiles-82963173a6b07039b084e918f72057312974a3ba.tar.gz dotfiles-82963173a6b07039b084e918f72057312974a3ba.zip | |
add vis config
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | config/vis/plugins/vis-cursors | 0 | ||||
| -rw-r--r-- | config/vis/themes/default.lua | 81 | ||||
| -rw-r--r-- | config/vis/visrc.lua | 29 | ||||
| -rwxr-xr-x | setup.py | 4 |
5 files changed, 116 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 3cfea36..cab7a0f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "vim/bundle/nerdcommenter"] path = vim/bundle/nerdcommenter url = https://github.com/scrooloose/nerdcommenter.git +[submodule "config/vis/plugins/vis-cursors"] + path = config/vis/plugins/vis-cursors + url = https://github.com/erf/vis-cursors diff --git a/config/vis/plugins/vis-cursors b/config/vis/plugins/vis-cursors new file mode 160000 +Subproject 0b46be8d008104891ef1eff48a021d3f5d175ea diff --git a/config/vis/themes/default.lua b/config/vis/themes/default.lua new file mode 100644 index 0000000..d065dca --- /dev/null +++ b/config/vis/themes/default.lua @@ -0,0 +1,81 @@ +-- Solarized color codes Copyright (c) 2011 Ethan Schoonover + +local lexers = vis.lexers + +-- The colors used by the solarized scheme for st +-- http://st.suckless.org/patches/solarized +-- +-- "#073642", /* 0: black */ -> base02 +-- "#dc322f", /* 1: red */ -> red +-- "#859900", /* 2: green */ -> green +-- "#b58900", /* 3: yellow */ -> yellow +-- "#268bd2", /* 4: blue */ -> blue +-- "#d33682", /* 5: magenta */ -> magenta +-- "#2aa198", /* 6: cyan */ -> cyan +-- "#eee8d5", /* 7: white */ -> base2 +-- "#002b36", /* 8: brblack */ -> base03 +-- "#cb4b16", /* 9: brred */ -> orange +-- "#586e75", /* 10: brgreen */ -> base01 +-- "#657b83", /* 11: bryellow */ -> base00 +-- "#839496", /* 12: brblue */ -> base0 +-- "#6c71c4", /* 13: brmagenta*/ -> violet +-- "#93a1a1", /* 14: brcyan */ -> base1 +-- "#fdf6e3", /* 15: brwhite */ -> base3 + + +local colors = { + ['base03'] = '8', -- '#002b36', + ['base02'] = '0', -- '#073642', + ['base01'] = '10', -- '#586e75', + ['base00'] = '11', -- '#657b83', + ['base0'] = '12', -- '#839496', + ['base1'] = '14', -- '#93a1a1', + ['base2'] = '7', -- '#eee8d5', + ['base3'] = '15', -- '#fdf6e3', + ['yellow'] = '3', -- '#b58900', + ['orange'] = '9', -- '#cb4b16', + ['red'] = '1', -- '#dc322f', + ['magenta'] = '5', -- '#d33682', + ['violet'] = '13', -- '#6c71c4', + ['blue'] = '4', -- '#268bd2', + ['cyan'] = '6', -- '#2aa198', + ['green'] = '2', -- '#859900', +} + +lexers.colors = colors +-- dark +local fg = ',fore:'..colors.base0..',' +local bg = ',back:'..colors.base03..',' +-- light +-- local fg = ',fore:'..colors.base03..',' +-- local bg = ',back:'..colors.base3..',' + +lexers.STYLE_DEFAULT = bg..fg +lexers.STYLE_NOTHING = bg +lexers.STYLE_CLASS = 'fore:yellow' +lexers.STYLE_COMMENT = 'fore:'..colors.base01 +lexers.STYLE_CONSTANT = 'fore:'..colors.cyan +lexers.STYLE_DEFINITION = 'fore:'..colors.blue +lexers.STYLE_ERROR = 'fore:'..colors.red..',italics' +lexers.STYLE_FUNCTION = 'fore:'..colors.blue +lexers.STYLE_KEYWORD = 'fore:'..colors.green +lexers.STYLE_LABEL = 'fore:'..colors.green +lexers.STYLE_NUMBER = 'fore:'..colors.cyan +lexers.STYLE_OPERATOR = 'fore:'..colors.green +lexers.STYLE_REGEX = 'fore:green' +lexers.STYLE_STRING = 'fore:'..colors.cyan +lexers.STYLE_PREPROCESSOR = 'fore:'..colors.orange +lexers.STYLE_TAG = 'fore:'..colors.red +lexers.STYLE_TYPE = 'fore:'..colors.yellow +lexers.STYLE_VARIABLE = 'fore:'..colors.blue +lexers.STYLE_WHITESPACE = '' +lexers.STYLE_EMBEDDED = 'back:blue' +lexers.STYLE_IDENTIFIER = fg + +lexers.STYLE_LINENUMBER = fg +lexers.STYLE_CURSOR = 'fore:'..colors.base03..',back:'..colors.base0 +lexers.STYLE_CURSOR_PRIMARY = lexers.STYLE_CURSOR..',back:yellow' +lexers.STYLE_CURSOR_LINE = 'back:'..colors.base00 +lexers.STYLE_COLOR_COLUMN = 'back:'..colors.base00 +-- lexers.STYLE_SELECTION = 'back:'..colors.base02 +lexers.STYLE_SELECTION = 'back:white' diff --git a/config/vis/visrc.lua b/config/vis/visrc.lua new file mode 100644 index 0000000..e558e58 --- /dev/null +++ b/config/vis/visrc.lua @@ -0,0 +1,29 @@ +-- load standard vis module, providing parts of the Lua API +require('vis') +require('plugins/filetype') +require('plugins/textobject-lexer') +require('plugins/vis-cursors/cursors').cursors_path = string.format('%s/vis/cursors', os.getenv('XDG_DATA_HOME') or os.getenv('HOME').."/.local/share") + +vis.events.subscribe(vis.events.INIT, function() + -- Your global configuration options + --vis:command("set theme ".. (vis.ui.colors <= 16 and "default-16" or "default-256")) + vis:command("set theme default") +end) + +vis.events.subscribe(vis.events.WIN_OPEN, function(win) + vis:command('set number') + vis:command('set tabwidth 4') + vis:command('set autoindent') + vis:command('set colorcolumn 80') + vis:command('set show-tabs') +end) + +--vis.events.subscribe(vis.events.FILE_SAVE_PRE, function(file) + ---- purge trailing whitespace + --local i = 1 + --while i <= #file.lines do + --file.lines[i] = file.lines[i]:match("(.-)%s*$") + --i = i + 1 + --end + --return true +--end) @@ -87,6 +87,8 @@ targets = { [("vimrc", home_dir + "/.vimrc")], "vim.d": [("vim", home_dir + "/.vim")], + "vis": + [("config/vis", home_dir + "./config/vis")], "ssh-config": [("ssh/config", home_dir + "/.ssh/config")], "xinitrc": @@ -129,7 +131,7 @@ targets = { ("FAU/start_fau_wlan.sh", home_dir + "/.local/bin/start_fau_wlan")] } -git_submodules_for = ["vim.d"] +git_submodules_for = ["vim.d", "vis"] def install_target(target, quiet): """Install a target""" |
