diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.nix | 3 | ||||
| -rw-r--r-- | lib/vimrc | 138 |
2 files changed, 4 insertions, 137 deletions
diff --git a/lib/common.nix b/lib/common.nix index 0975cfd..64d0829 100644 --- a/lib/common.nix +++ b/lib/common.nix @@ -22,6 +22,7 @@ in FD_OPTIONS = "--follow --exclude .git"; BAT_PAGER = "less -R"; + FZF_DEFAULT_OPTS = "--bind='?:toggle-preview'"; FZF_DEFAULT_COMMAND = "git ls-files --cached --others --exclude-standard | fd --type f --type l $FD_OPTIONS"; FZF_CTRL_T_COMMAND = "fd $FD_OPTIONS"; FZF_ALT_C_COMMAND = "fd --type d $FD_OPTIONS"; @@ -291,7 +292,7 @@ in tdate = "date +%Y.%m.%d..%H.%M"; ttime = "date +%H.%M"; typeless = "history | tail -n 20000 | sed 's/.* //' | sort | uniq -c | sort -g | tail -n 100"; - v = "vim $(fzf)"; + v = "vim $(fzf --preview='bat --color=always {}' --preview-window right:70%)"; "v." = "vim ."; }; }; @@ -104,39 +104,9 @@ function! <SID>SynStack() echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")') endfunc -"colorscheme monochrome -" -"let g:colors_name = 'monochrome' -" -let s:white = ['White', 15] -let s:black = ['#0e1111', 16] -let s:dblack = ['#111111', 1] -let s:bgray = ['#181818', 233] -let s:lgray = ['LightGray', 255] -let s:cgray = ['#737373', 243] -let s:dgray = ['DarkGray', 248] -let s:sblue = ['LightBlue', 67] -let s:yellow = ['LightYellow', 226] -let s:red = ['LightRed', 160] -let s:green = ['LightGreen', 28] -let s:purple = ['LightMagenta', 13] -" -let s:default_fg = s:lgray -let s:default_bg = s:black +colorscheme basic-dark -let s:italic = 'italic' -let s:bold = 'bold' -let s:underline = 'underline' -let s:none = 'NONE' - -let s:default_lst = [] -let s:default_str = '' - -if !exists("g:monochrome_italic_comments") - let g:monochrome_italic_comments = 0 -endif -let s:comment_attr = g:monochrome_italic_comments ? s:italic : s:none -" +" A function for setting colors, if I want it... function! s:hi(...) let group = a:1 let fg = get(a:, 2, s:default_fg) @@ -163,107 +133,3 @@ function! s:hi(...) exec join(cmd, ' ') endfunction -"" --- Vim interface ------------------------------------------------------------ -call s:hi('Normal') -highlight clear Cursor -highlight clear CursorLine " clear the underline nonsense -call s:hi('Cursor', s:black, s:sblue) -call s:hi('lCursor', s:black, s:sblue) -call s:hi('CursorLine', s:black, s:sblue, s:none) -call s:hi('CursorLineNr', s:white, s:sblue, s:bold) -call s:hi('CursorColumn', s:black, s:sblue, s:none) -call s:hi('ColorColumn', s:lgray, s:dblack, s:none) -call s:hi('Search', s:black, s:purple) -call s:hi('Visual', s:black, s:green) -call s:hi('ErrorMsg', s:white, s:red) -call s:hi('StatusLine', s:black, s:purple) -call s:hi('StatusLineNC', s:black, s:purple) -call s:hi('VertSplit', s:black, s:purple) -" -"" Tildes at the bottom of a buffer, etc. -call s:hi('NonText', s:dgray) -" -"" Folding. -"call s:hi('FoldColumn', s:dgray) -"call s:hi('Folded') -" -"" Line numbers gutter. -"call s:hi('LineNr', s:dgray) -" -"" Small arrow used for tabs. -"call s:hi('SpecialKey', s:sblue, s:default_bg, s:bold) -" -"" File browsers. -"call s:hi('Directory', s:white, s:default_bg, s:bold) -" -"" Help. -"call s:hi('helpSpecial') -"call s:hi('helpHyperTextJump', s:sblue, s:default_bg, s:underline) -"call s:hi('helpNote') -" -"" Popup menu. -"call s:hi('Pmenu', s:white, s:sblue) -"call s:hi('PmenuSel', s:sblue, s:white) -" -"" Notes. -"call s:hi('Todo', s:black, s:yellow, s:bold) -" -"" Signs. -"call s:hi('SignColumn') -" -"" --- Languages --------------------------------------------------------------- -"call s:hi('Statement', s:white, s:default_bg, s:bold) -"call s:hi('PreProc', s:white, s:default_bg, s:bold) -"call s:hi('String', s:sblue) -"call s:hi('Comment', s:cgray, s:default_bg, s:comment_attr) -"call s:hi('Constant') -"call s:hi('Type', s:white, s:default_bg, s:bold) -"call s:hi('Function', s:white) -"call s:hi('Identifier') -"call s:hi('Special') -"call s:hi('MatchParen', s:black, s:lgray) -"call s:hi('vimOption') -"call s:hi('vimGroup') -"call s:hi('vimHiClear') -"call s:hi('vimHiGroup') -"call s:hi('vimHiAttrib') -"call s:hi('vimHiGui') -"call s:hi('vimHiGuiFgBg') -"call s:hi('vimHiCTerm') -"call s:hi('vimHiCTermFgBg') -"call s:hi('vimSynType') -"hi link vimCommentTitle Comment -"call s:hi('pythonEscape', s:sblue) -"call s:hi('javaScriptFunction', s:white, s:default_bg, s:bold) -"call s:hi('perlSharpBang', s:cgray) -"call s:hi('perlStringStartEnd', s:sblue) -"call s:hi('perlStringEscape', s:sblue) -"call s:hi('perlMatchStartEnd', s:sblue) -"call s:hi('elixirAlias', s:default_fg, s:default_bg, s:none) -"call s:hi('elixirDelimiter', s:sblue) -"call s:hi('elixirSelf', s:default_fg, s:default_bg, s:none) -"" For ||, ->, etc. -"call s:hi('elixirOperator') -"" Module attributes like @doc or @type. -"hi link elixirVariable Statement -"" While rendered as comments in other languages, docstrings are strings, -"" experimental. -"hi link elixirDocString String -"hi link elixirDocTest String -"hi link elixirStringDelimiter String -"call s:hi('rubyConstant') -"call s:hi('rubySharpBang', s:cgray) -"call s:hi('rubyStringDelimiter', s:sblue) -"call s:hi('rubyStringEscape', s:sblue) -"call s:hi('rubyRegexpEscape', s:sblue) -"call s:hi('rubyRegexpAnchor', s:sblue) -"call s:hi('rubyRegexpSpecial', s:sblue) -" -"" --- Diffs -------------------------------------------------------------------- -"call s:hi('diffFile', s:cgray) -"call s:hi('diffNewFile', s:cgray) -"call s:hi('diffIndexLine', s:cgray) -"call s:hi('diffLine', s:cgray) -"call s:hi('diffSubname', s:cgray) -"call s:hi('diffAdded', s:white, s:green) -"call s:hi('diffRemoved', s:white, s:red) |