From bae2e5259d846b1019e8ee0ceaca452afc81a4dd Mon Sep 17 00:00:00 2001 From: "flyingscorpio@clevo" Date: Fri, 29 Jul 2022 11:46:55 +0200 Subject: [PATCH] Remove vim-plug things and other vim dependent things --- roles/neovim/files/colors/apprentice.vim | 224 ---------------------- roles/neovim/files/colors/monokai.vim | 109 ----------- roles/neovim/files/colors/wombat256.vim | 64 ------- roles/neovim/files/init.vim | 6 +- roles/neovim/files/vimrc | 232 ----------------------- roles/neovim/tasks/main.yml | 70 ------- 6 files changed, 3 insertions(+), 702 deletions(-) delete mode 100644 roles/neovim/files/colors/apprentice.vim delete mode 100644 roles/neovim/files/colors/monokai.vim delete mode 100644 roles/neovim/files/colors/wombat256.vim delete mode 100644 roles/neovim/files/vimrc diff --git a/roles/neovim/files/colors/apprentice.vim b/roles/neovim/files/colors/apprentice.vim deleted file mode 100644 index 5b3f1aa..0000000 --- a/roles/neovim/files/colors/apprentice.vim +++ /dev/null @@ -1,224 +0,0 @@ -" Apprentice.vim -- Vim color scheme. -" Author: Romain Lafourcade (romainlafourcade@gmail.com) -" Webpage: https://github.com/romainl/Apprentice -" Description: Essentially a streamlining and conversion to xterm colors of 'sorcerer' by Jeet Sukumaran (jeetsukumaran@gmailcom) -" Last Change: 2020-03-22 - -hi clear -if exists("syntax_on") - syntax reset -endif - -let colors_name = "apprentice" - -if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") - hi Normal ctermbg=235 ctermfg=250 cterm=NONE guibg=#262626 guifg=#bcbcbc gui=NONE - hi NonText ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#585858 gui=NONE - hi EndOfBuffer ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#585858 gui=NONE - hi LineNr ctermbg=234 ctermfg=242 cterm=NONE guibg=#1c1c1c guifg=#6c6c6c gui=NONE - hi FoldColumn ctermbg=234 ctermfg=242 cterm=NONE guibg=#1c1c1c guifg=#6c6c6c gui=NONE - hi Folded ctermbg=234 ctermfg=242 cterm=NONE guibg=#1c1c1c guifg=#6c6c6c gui=NONE - hi MatchParen ctermbg=234 ctermfg=229 cterm=NONE guibg=#1c1c1c guifg=#ffffaf gui=NONE - hi SignColumn ctermbg=234 ctermfg=242 cterm=NONE guibg=#1c1c1c guifg=#6c6c6c gui=NONE - hi Comment ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#585858 gui=NONE - hi Conceal ctermbg=NONE ctermfg=250 cterm=NONE guibg=NONE guifg=#bcbcbc gui=NONE - hi Constant ctermbg=NONE ctermfg=208 cterm=NONE guibg=NONE guifg=#ff8700 gui=NONE - hi Error ctermbg=NONE ctermfg=131 cterm=reverse guibg=NONE guifg=#af5f5f gui=reverse - hi Identifier ctermbg=NONE ctermfg=67 cterm=NONE guibg=NONE guifg=#5f87af gui=NONE - hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi PreProc ctermbg=NONE ctermfg=66 cterm=NONE guibg=NONE guifg=#5f8787 gui=NONE - hi Special ctermbg=NONE ctermfg=65 cterm=NONE guibg=NONE guifg=#5f875f gui=NONE - hi Statement ctermbg=NONE ctermfg=110 cterm=NONE guibg=NONE guifg=#8fafd7 gui=NONE - hi String ctermbg=NONE ctermfg=108 cterm=NONE guibg=NONE guifg=#87af87 gui=NONE - hi Todo ctermbg=NONE ctermfg=NONE cterm=reverse guibg=NONE guifg=NONE gui=reverse - hi Type ctermbg=NONE ctermfg=103 cterm=NONE guibg=NONE guifg=#8787af gui=NONE - hi Underlined ctermbg=NONE ctermfg=66 cterm=underline guibg=NONE guifg=#5f8787 gui=underline - hi Pmenu ctermbg=238 ctermfg=250 cterm=NONE guibg=#444444 guifg=#bcbcbc gui=NONE - hi PmenuSbar ctermbg=240 ctermfg=NONE cterm=NONE guibg=#585858 guifg=NONE gui=NONE - hi PmenuSel ctermbg=66 ctermfg=235 cterm=NONE guibg=#5f8787 guifg=#262626 gui=NONE - hi PmenuThumb ctermbg=66 ctermfg=66 cterm=NONE guibg=#5f8787 guifg=#5f8787 gui=NONE - hi ErrorMsg ctermbg=131 ctermfg=235 cterm=NONE guibg=#af5f5f guifg=#262626 gui=NONE - hi ModeMsg ctermbg=108 ctermfg=235 cterm=NONE guibg=#87af87 guifg=#262626 gui=NONE - hi MoreMsg ctermbg=NONE ctermfg=66 cterm=NONE guibg=NONE guifg=#5f8787 gui=NONE - hi Question ctermbg=NONE ctermfg=108 cterm=NONE guibg=NONE guifg=#87af87 gui=NONE - hi WarningMsg ctermbg=NONE ctermfg=131 cterm=NONE guibg=NONE guifg=#af5f5f gui=NONE - hi TabLine ctermbg=238 ctermfg=101 cterm=NONE guibg=#444444 guifg=#87875f gui=NONE - hi TabLineFill ctermbg=238 ctermfg=238 cterm=NONE guibg=#444444 guifg=#444444 gui=NONE - hi TabLineSel ctermbg=101 ctermfg=235 cterm=NONE guibg=#87875f guifg=#262626 gui=NONE - hi ToolbarLine ctermbg=234 ctermfg=NONE cterm=NONE guibg=#1c1c1c guifg=NONE gui=NONE - hi ToolbarButton ctermbg=240 ctermfg=250 cterm=NONE guibg=#585858 guifg=#bcbcbc gui=NONE - hi Cursor ctermbg=242 ctermfg=NONE cterm=NONE guibg=#6c6c6c guifg=NONE gui=NONE - hi CursorColumn ctermbg=236 ctermfg=NONE cterm=NONE guibg=#303030 guifg=NONE gui=NONE - hi CursorLineNr ctermbg=236 ctermfg=73 cterm=NONE guibg=#303030 guifg=#5fafaf gui=NONE - hi CursorLine ctermbg=236 ctermfg=NONE cterm=NONE guibg=#303030 guifg=NONE gui=NONE - hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi StatusLine ctermbg=101 ctermfg=235 cterm=NONE guibg=#87875f guifg=#262626 gui=NONE - hi StatusLineNC ctermbg=238 ctermfg=101 cterm=NONE guibg=#444444 guifg=#87875f gui=NONE - hi StatusLineTerm ctermbg=101 ctermfg=235 cterm=NONE guibg=#87875f guifg=#262626 gui=NONE - hi StatusLineTermNC ctermbg=238 ctermfg=101 cterm=NONE guibg=#444444 guifg=#87875f gui=NONE - hi Visual ctermbg=235 ctermfg=110 cterm=reverse guibg=#262626 guifg=#8fafd7 gui=reverse - hi VisualNOS ctermbg=NONE ctermfg=NONE cterm=underline guibg=NONE guifg=NONE gui=underline - hi VertSplit ctermbg=238 ctermfg=238 cterm=NONE guibg=#444444 guifg=#444444 gui=NONE - hi WildMenu ctermbg=110 ctermfg=235 cterm=NONE guibg=#8fafd7 guifg=#262626 gui=NONE - hi Function ctermbg=NONE ctermfg=229 cterm=NONE guibg=NONE guifg=#ffffaf gui=NONE - hi SpecialKey ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#585858 gui=NONE - hi Title ctermbg=NONE ctermfg=231 cterm=NONE guibg=NONE guifg=#ffffff gui=NONE - hi DiffAdd ctermbg=235 ctermfg=108 cterm=reverse guibg=#262626 guifg=#87af87 gui=reverse - hi DiffChange ctermbg=235 ctermfg=103 cterm=reverse guibg=#262626 guifg=#8787af gui=reverse - hi DiffDelete ctermbg=235 ctermfg=131 cterm=reverse guibg=#262626 guifg=#af5f5f gui=reverse - hi DiffText ctermbg=235 ctermfg=208 cterm=reverse guibg=#262626 guifg=#ff8700 gui=reverse - hi IncSearch ctermbg=131 ctermfg=235 cterm=NONE guibg=#af5f5f guifg=#262626 gui=NONE - hi Search ctermbg=229 ctermfg=235 cterm=NONE guibg=#ffffaf guifg=#262626 gui=NONE - hi Directory ctermbg=NONE ctermfg=73 cterm=NONE guibg=NONE guifg=#5fafaf gui=NONE - hi debugPC ctermbg=67 ctermfg=NONE cterm=NONE guibg=#5f87af guifg=NONE gui=NONE - hi debugBreakpoint ctermbg=131 ctermfg=NONE cterm=NONE guibg=#af5f5f guifg=NONE gui=NONE - hi SpellBad ctermbg=NONE ctermfg=131 cterm=undercurl guibg=NONE guifg=#af5f5f gui=undercurl guisp=#af5f5f - hi SpellCap ctermbg=NONE ctermfg=73 cterm=undercurl guibg=NONE guifg=#5fafaf gui=undercurl guisp=#5fafaf - hi SpellLocal ctermbg=NONE ctermfg=65 cterm=undercurl guibg=NONE guifg=#5f875f gui=undercurl guisp=#5f875f - hi SpellRare ctermbg=NONE ctermfg=208 cterm=undercurl guibg=NONE guifg=#ff8700 gui=undercurl guisp=#ff8700 - hi ColorColumn ctermbg=234 ctermfg=NONE cterm=NONE guibg=#1c1c1c guifg=NONE gui=NONE - -elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 - set t_Co=16 - - hi Normal ctermbg=black ctermfg=lightgrey cterm=NONE - hi NonText ctermbg=NONE ctermfg=darkgrey cterm=NONE - hi EndOfBuffer ctermbg=NONE ctermfg=darkgrey cterm=NONE - hi LineNr ctermbg=black ctermfg=lightgrey cterm=NONE - hi FoldColumn ctermbg=black ctermfg=lightgrey cterm=NONE - hi Folded ctermbg=black ctermfg=lightgrey cterm=NONE - hi MatchParen ctermbg=black ctermfg=yellow cterm=NONE - hi SignColumn ctermbg=black ctermfg=lightgrey cterm=NONE - hi Comment ctermbg=NONE ctermfg=darkgrey cterm=NONE - hi Conceal ctermbg=NONE ctermfg=lightgrey cterm=NONE - hi Constant ctermbg=NONE ctermfg=red cterm=NONE - hi Error ctermbg=NONE ctermfg=darkred cterm=reverse - hi Identifier ctermbg=NONE ctermfg=darkblue cterm=NONE - hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE - hi PreProc ctermbg=NONE ctermfg=darkcyan cterm=NONE - hi Special ctermbg=NONE ctermfg=darkgreen cterm=NONE - hi Statement ctermbg=NONE ctermfg=blue cterm=NONE - hi String ctermbg=NONE ctermfg=green cterm=NONE - hi Todo ctermbg=NONE ctermfg=NONE cterm=reverse - hi Type ctermbg=NONE ctermfg=magenta cterm=NONE - hi Underlined ctermbg=NONE ctermfg=darkcyan cterm=underline - hi Pmenu ctermbg=darkgrey ctermfg=lightgrey cterm=NONE - hi PmenuSbar ctermbg=darkgrey ctermfg=NONE cterm=NONE - hi PmenuSel ctermbg=darkcyan ctermfg=black cterm=NONE - hi PmenuThumb ctermbg=darkcyan ctermfg=darkcyan cterm=NONE - hi ErrorMsg ctermbg=darkred ctermfg=black cterm=NONE - hi ModeMsg ctermbg=green ctermfg=black cterm=NONE - hi MoreMsg ctermbg=NONE ctermfg=darkcyan cterm=NONE - hi Question ctermbg=NONE ctermfg=green cterm=NONE - hi WarningMsg ctermbg=NONE ctermfg=darkred cterm=NONE - hi TabLine ctermbg=darkgrey ctermfg=darkyellow cterm=NONE - hi TabLineFill ctermbg=darkgrey ctermfg=darkgrey cterm=NONE - hi TabLineSel ctermbg=darkyellow ctermfg=black cterm=NONE - hi ToolbarLine ctermbg=black ctermfg=NONE cterm=NONE - hi ToolbarButton ctermbg=darkgrey ctermfg=lightgrey cterm=NONE - hi Cursor ctermbg=lightgrey ctermfg=NONE cterm=NONE - hi CursorColumn ctermbg=darkgrey ctermfg=NONE cterm=NONE - hi CursorLineNr ctermbg=darkgrey ctermfg=cyan cterm=NONE - hi CursorLine ctermbg=darkgrey ctermfg=NONE cterm=NONE - hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE - hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE - hi StatusLine ctermbg=darkyellow ctermfg=black cterm=NONE - hi StatusLineNC ctermbg=darkgrey ctermfg=darkyellow cterm=NONE - hi StatusLineTerm ctermbg=darkyellow ctermfg=black cterm=NONE - hi StatusLineTermNC ctermbg=darkgrey ctermfg=darkyellow cterm=NONE - hi Visual ctermbg=black ctermfg=blue cterm=reverse - hi VisualNOS ctermbg=NONE ctermfg=NONE cterm=underline - hi VertSplit ctermbg=darkgrey ctermfg=darkgrey cterm=NONE - hi WildMenu ctermbg=blue ctermfg=black cterm=NONE - hi Function ctermbg=NONE ctermfg=yellow cterm=NONE - hi SpecialKey ctermbg=NONE ctermfg=darkgrey cterm=NONE - hi Title ctermbg=NONE ctermfg=white cterm=NONE - hi DiffAdd ctermbg=black ctermfg=green cterm=reverse - hi DiffChange ctermbg=black ctermfg=magenta cterm=reverse - hi DiffDelete ctermbg=black ctermfg=darkred cterm=reverse - hi DiffText ctermbg=black ctermfg=red cterm=reverse - hi IncSearch ctermbg=darkred ctermfg=black cterm=NONE - hi Search ctermbg=yellow ctermfg=black cterm=NONE - hi Directory ctermbg=NONE ctermfg=cyan cterm=NONE - hi debugPC ctermbg=darkblue ctermfg=NONE cterm=NONE - hi debugBreakpoint ctermbg=darkred ctermfg=NONE cterm=NONE - hi SpellBad ctermbg=NONE ctermfg=darkred cterm=undercurl - hi SpellCap ctermbg=NONE ctermfg=cyan cterm=undercurl - hi SpellLocal ctermbg=NONE ctermfg=darkgreen cterm=undercurl - hi SpellRare ctermbg=NONE ctermfg=red cterm=undercurl - hi ColorColumn ctermbg=black ctermfg=NONE cterm=NONE -endif - -hi link Terminal Normal -hi link Number Constant -hi link CursorIM Cursor -hi link Boolean Constant -hi link Character Constant -hi link Conditional Statement -hi link Debug Special -hi link Define PreProc -hi link Delimiter Special -hi link Exception Statement -hi link Float Number -hi link HelpCommand Statement -hi link HelpExample Statement -hi link Include PreProc -hi link Keyword Statement -hi link Label Statement -hi link Macro PreProc -hi link Number Constant -hi link Operator Statement -hi link PreCondit PreProc -hi link Repeat Statement -hi link SpecialChar Special -hi link SpecialComment Special -hi link StorageClass Type -hi link Structure Type -hi link Tag Special -hi link Terminal Normal -hi link Typedef Type -hi link htmlTagName Statement -hi link htmlEndTag htmlTagName -hi link htmlLink Function -hi link htmlSpecialTagName htmlTagName -hi link htmlTag htmlTagName -hi link htmlBold Normal -hi link htmlItalic Normal -hi link htmlArg htmlTagName -hi link xmlTag Statement -hi link xmlTagName Statement -hi link xmlEndTag Statement -hi link markdownItalic Preproc -hi link asciidocQuotedEmphasized Preproc -hi link diffBDiffer WarningMsg -hi link diffCommon WarningMsg -hi link diffDiffer WarningMsg -hi link diffIdentical WarningMsg -hi link diffIsA WarningMsg -hi link diffNoEOL WarningMsg -hi link diffOnly WarningMsg -hi link diffRemoved WarningMsg -hi link diffAdded String -hi link QuickFixLine Search - -let g:terminal_ansi_colors = [ - \ '#1c1c1c', - \ '#af5f5f', - \ '#5f875f', - \ '#87875f', - \ '#5f87af', - \ '#5f5f87', - \ '#5f8787', - \ '#6c6c6c', - \ '#444444', - \ '#ff8700', - \ '#87af87', - \ '#ffffaf', - \ '#8fafd7', - \ '#8787af', - \ '#5fafaf', - \ '#ffffff', - \ ] - -" Generated with RNB (https://github.com/romainl/vim-rnb) diff --git a/roles/neovim/files/colors/monokai.vim b/roles/neovim/files/colors/monokai.vim deleted file mode 100644 index 1b4f167..0000000 --- a/roles/neovim/files/colors/monokai.vim +++ /dev/null @@ -1,109 +0,0 @@ -" Vim color file -" Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration) - -set background=dark -highlight clear - -if exists("syntax_on") - syntax reset -endif - -set t_Co=256 -let g:colors_name = "monokai" - -hi Cursor ctermfg=235 ctermbg=231 cterm=NONE guifg=#272822 guibg=#f8f8f0 gui=NONE -hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE -hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi LineNr ctermfg=102 ctermbg=237 cterm=NONE guifg=#90908a guibg=#3c3d37 gui=NONE -hi VertSplit ctermfg=241 ctermbg=241 cterm=NONE guifg=#64645e guibg=#64645e gui=NONE -hi MatchParen ctermfg=197 ctermbg=NONE cterm=underline guifg=#f92672 guibg=NONE gui=underline -hi StatusLine ctermfg=231 ctermbg=241 cterm=bold guifg=#f8f8f2 guibg=#64645e gui=bold -hi StatusLineNC ctermfg=231 ctermbg=241 cterm=NONE guifg=#f8f8f2 guibg=#64645e gui=NONE -hi Pmenu ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE -hi IncSearch term=reverse cterm=reverse ctermfg=193 ctermbg=16 gui=reverse guifg=#C4BE89 guibg=#000000 -hi Search term=reverse cterm=NONE ctermfg=231 ctermbg=24 gui=NONE guifg=#f8f8f2 guibg=#204a87 -hi Directory ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Folded ctermfg=242 ctermbg=235 cterm=NONE guifg=#75715e guibg=#272822 gui=NONE -hi SignColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi Normal ctermfg=231 ctermbg=235 cterm=NONE guifg=#f8f8f2 guibg=#272822 gui=NONE -hi Boolean ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Character ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Comment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE -hi Conditional ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi Define ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f8f8f2 guibg=#46830c gui=bold -hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8b0807 guibg=NONE gui=NONE -hi DiffChange ctermfg=NONE ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=#243955 gui=NONE -hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f8f8f2 guibg=#204a87 gui=bold -hi ErrorMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE -hi WarningMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE -hi Float ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Function ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi Keyword ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Label ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi NonText ctermfg=59 ctermbg=236 cterm=NONE guifg=#49483e guibg=#31322c gui=NONE -hi Number ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Operator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=NONE gui=NONE -hi SpecialComment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE -hi SpecialKey ctermfg=59 ctermbg=237 cterm=NONE guifg=#49483e guibg=#3c3d37 gui=NONE -hi Statement ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi StorageClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi String ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi Tag ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f2 guibg=NONE gui=bold -hi Todo ctermfg=95 ctermbg=NONE cterm=inverse,bold guifg=#75715e guibg=NONE gui=inverse,bold -hi Type ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi rubyClass ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyFunction ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubySymbol ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi rubyConstant ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi rubyStringDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyBlockParameter ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic -hi rubyInstanceVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyInclude ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyGlobalVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyRegexp ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyRegexpDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyEscape ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi rubyControl ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyClassVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyOperator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyException ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyPseudoVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyRailsUserClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi rubyRailsARAssociationMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsARMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsRenderMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi erubyComment ctermfg=95 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE -hi erubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi htmlTag ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi htmlEndTag ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi htmlTagName ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi htmlArg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi htmlSpecialChar ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi javaScriptFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi javaScriptRailsFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlKey ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi yamlAnchor ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlAlias ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlDocumentHeader ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi cssURL ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic -hi cssFunctionName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi cssColor ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi cssPseudoClassId ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi cssClassName ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi cssValueLength ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi cssCommonAttr ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE diff --git a/roles/neovim/files/colors/wombat256.vim b/roles/neovim/files/colors/wombat256.vim deleted file mode 100644 index b22e5ba..0000000 --- a/roles/neovim/files/colors/wombat256.vim +++ /dev/null @@ -1,64 +0,0 @@ -" Vim color file -" Original Maintainer: Lars H. Nielsen (dengmao@gmail.com) -" Last Change: 2010-07-23 -" -" Converting for 256-color terminals by -" Danila Bespalov (danila.bespalov@gmail.com) -" with great help of tool by Wolfgang Frisch (xororand@frexx.de) -" inspired by David Liang's version (bmdavll@gmail.com) - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "wombat256" - - -" General colors -hi Normal ctermfg=254 ctermbg=234 cterm=none guifg=#f6f3e8 guibg=#242424 gui=none -hi Cursor ctermfg=none ctermbg=241 cterm=none guifg=NONE guibg=#656565 gui=none -hi Visual ctermfg=7 ctermbg=238 cterm=none guifg=#f6f3e8 guibg=#444444 gui=none -" hi VisualNOS -" hi Search -hi Folded ctermfg=103 ctermbg=238 cterm=none guifg=#a0a8b0 guibg=#384048 gui=none -hi Title ctermfg=7 ctermbg=none cterm=bold guifg=#f6f3e8 guibg=NONE gui=bold -hi StatusLine ctermfg=7 ctermbg=238 cterm=none guifg=#f6f3e8 guibg=#444444 gui=italic -hi VertSplit ctermfg=238 ctermbg=238 cterm=none guifg=#444444 guibg=#444444 gui=none -hi StatusLineNC ctermfg=243 ctermbg=238 cterm=none guifg=#857b6f guibg=#444444 gui=none -hi LineNr ctermfg=243 ctermbg=0 cterm=none guifg=#857b6f guibg=#000000 gui=none -hi SpecialKey ctermfg=244 ctermbg=236 cterm=none guifg=#808080 guibg=#343434 gui=none -hi NonText ctermfg=244 ctermbg=236 cterm=none guifg=#808080 guibg=#303030 gui=none - -" Vim >= 7.0 specific colors -if version >= 700 -hi CursorLine ctermbg=236 cterm=none guibg=#2d2d2d -hi MatchParen ctermfg=7 ctermbg=243 cterm=bold guifg=#f6f3e8 guibg=#857b6f gui=bold -hi Pmenu ctermfg=7 ctermbg=238 guifg=#f6f3e8 guibg=#444444 -hi PmenuSel ctermfg=0 ctermbg=192 guifg=#000000 guibg=#cae682 -endif - - -" Syntax highlighting -hi Keyword ctermfg=111 cterm=none guifg=#8ac6f2 gui=none -hi Statement ctermfg=111 cterm=none guifg=#8ac6f2 gui=none -hi Constant ctermfg=173 cterm=none guifg=#e5786d gui=none -hi Number ctermfg=173 cterm=none guifg=#e5786d gui=none -hi PreProc ctermfg=173 cterm=none guifg=#e5786d gui=none -hi Function ctermfg=192 cterm=none guifg=#cae682 gui=none -hi Identifier ctermfg=192 cterm=none guifg=#cae682 gui=none -hi Type ctermfg=192 cterm=none guifg=#cae682 gui=none -hi Special ctermfg=194 cterm=none guifg=#e7f6da gui=none -hi String ctermfg=113 cterm=none guifg=#95e454 gui=italic -hi Comment ctermfg=246 cterm=none guifg=#99968b gui=italic -hi Todo ctermfg=245 cterm=none guifg=#8f8f8f gui=italic - - -" Links -hi! link FoldColumn Folded -hi! link CursorColumn CursorLine - -" vim:set ts=4 sw=4 noet: diff --git a/roles/neovim/files/init.vim b/roles/neovim/files/init.vim index 3e87691..3fa2ebe 100644 --- a/roles/neovim/files/init.vim +++ b/roles/neovim/files/init.vim @@ -5,6 +5,6 @@ lua require('spacetabs') lua require('packer') lua require('colors') -set runtimepath^=~/.vim runtimepath+=~/.vim/after -let &packpath = &runtimepath -source ~/.vimrc +"set runtimepath^=~/.vim runtimepath+=~/.vim/after +"let &packpath = &runtimepath +"source ~/.vimrc diff --git a/roles/neovim/files/vimrc b/roles/neovim/files/vimrc deleted file mode 100644 index 610d822..0000000 --- a/roles/neovim/files/vimrc +++ /dev/null @@ -1,232 +0,0 @@ -" flyingscorpio's VIM Configuration File -" most of this comes from https://dougblack.io/words/a-good-vimrc.html - -set nocompatible " disable vi compatibility (emulation of old bugs) -" UTF-8 ENCODING {{{ -set enc=utf-8 -set fenc=utf-8 -set termencoding=utf-8 -" }}} -" LEADER SHORTCUTS {{{ -let mapleader=" " - -" jk is escape -inoremap jk - -" F2 to save file -nmap :w -imap :wi - -" global copy/paste -nmap y "*yy -nmap p "*p - -" run make -nmap m :w:!make - -" follow file in split window -nmap gf :splitgf -nmap vgf :vertical splitgf - -" open terminal in split window -if has('nvim') - nmap t :below 10split:terminali -else - nmap t :below terminal ++rows=10 -endif -" }}} -" VIM-PLUG {{{ -call plug#begin('~/.vim/plugged') - -" AUTOCOMPLETION, FORMATTING AND LINTING -" Main autocompletion -Plug 'neoclide/coc.nvim', { 'branch': 'release' } -"Auto close parens and such -Plug 'Townk/vim-autoclose' -" PEP8 linting for Python -Plug 'nvie/vim-flake8' -" Vim integration for various linters -Plug 'dense-analysis/ale' -" Black autoformatter for Python -Plug 'psf/black', { 'tag': 'stable' } -"Surround -Plug 'tpope/vim-surround' -" Snippets -Plug 'SirVer/ultisnips' -Plug 'honza/vim-snippets' - -"COLOR SCHEMES -Plug 'morhetz/gruvbox' -Plug 'sjl/badwolf' - -" HIGHLIGHTING -" Whitespace highlighting and removal -Plug 'ntpeters/vim-better-whitespace' -" C syntax highlighting -Plug 'vim-scripts/c.vim' -" Rust syntax highlighting -Plug 'rust-lang/rust.vim' -" Markdown syntax highlighting -Plug 'godlygeek/tabular' | Plug 'plasticboy/vim-markdown' -" Ansible syntax highlighting -Plug 'pearofducks/ansible-vim', { 'do': './UltiSnips/generate.sh' } -" PowerShell syntax hightlighting -Plug 'PProvost/vim-ps1' -" Twig syntax hightlighting -Plug 'nelsyeung/twig.vim' - -" STATUSLINE -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' - -" MISC. -" Python IDE -Plug 'python-mode/python-mode', { 'for': 'python', 'branch': 'develop' } -" A tree explorer plugin -Plug 'preservim/nerdtree' -" A NERDTree plugin showing git status -Plug 'Xuyuanp/nerdtree-git-plugin' -" Display thin vertical lines at each indentation level -Plug 'Yggdroot/indentLine' -" VimTeX -Plug 'lervag/vimtex' -" LilyPond -Plug 'sersorrel/vim-lilypond' - -call plug#end() -" }}} -" PLUGIN OPTIONS {{{ -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~ '\s' -endfunction -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() - -let g:ale_python_mypy_options = '--strict --strict-optional' -let g:ale_linters_ignore = ['lacheck'] - -let g:pymode_options_max_line_length = 90 -let g:pymode_options_colorcolumn = 0 -let g:pymode_lint_ignore = ["E203"] - -let g:coc_global_extensions = [ 'coc-clangd', 'coc-sh', 'coc-powershell', 'coc-phpls', 'coc-pyright', 'coc-java', 'coc-json', 'coc-html', 'coc-css', 'coc-vimtex' ] - -let NERDTreeIgnore=['^__pycache__$', '\.pyc', '\~$'] " ignore files in NERDTree - -" in normal mode open NERDTree -nmap ne :NERDTree - -" let g:indentLine_char = '▏' -let g:indentLine_fileType = ['html', 'htmldjango'] - -let g:tex_flavor = 'latex' -let g:vimtex_view_method = 'zathura' -let g:vimtex_quickfix_autoclose_after_keystrokes = 2 -let g:vimtex_quickfix_open_on_warning = 0 - -let g:UltiSnipsExpandTrigger = '' - -" }}} -" COLORS {{{ -syntax on -if $TERM =~# '256color' && ( $TERM =~# '^screen' || $TERM =~# '^tmux' ) - let &t_8f = "\[38;2;%lu;%lu;%lum" - let &t_8b = "\[48;2;%lu;%lu;%lum" - set termguicolors -endif -let g:gruvbox_contrast_dark='hard' -let g:gruvbox_transparent_bg = 1 -let g:gruvbox_italic = 1 -set background=dark -colorscheme gruvbox -"let g:airline_theme='gruvbox' -let &t_ut = '' " Disable BCE (background color erase) -" }}} -" SPACES & TABS {{{ -set expandtab " expand tabs to spaces -set shiftwidth=4 -set softtabstop=4 " number of spaces in tab when editing -" }}} -" UI CONFIG {{{ -let &t_SI = "\e[5 q" " cursor beam on insert mode -let &t_SR = "\e[3 q" " cursor underline on replace mode -let &t_EI = "\e[2 q" " cursor block otherwise - -set number relativenumber " hybrid line numbers -set spelllang=en,fr -set showcmd " show command in bottom bar -set cursorline " highlight current line -filetype indent on " load filetype-specific indent files -set autoindent " use indentation of previous line -set smartindent " use intelligent indentation for C -set wildmenu " visual autocomplete for command menu -set lazyredraw " redraw only when necessary -set showmatch " highlight matching braces -" }}} -" SEARCHING {{{ -set path+=** " Find files in sub-folders too -set incsearch " search as characters are entered -set hlsearch " highlight matches -" turn off search hightlight after search -nnoremap , :nohlsearch -" }}} -" FOLDING {{{ -set foldenable " enable folding -set foldlevelstart=10 " open most folds by default (0 to 99) -set foldnestmax=10 " guard against too many nested folds -set foldmethod=syntax " fold based on filetype -" }}} -" MOVEMENT {{{ -" move vertically by visual line (don't jump wrapped lines) -"nnoremap j gj -"nnoremap k gk -" move between splits more easily -map h -map j -map k -map l -" }}} -" AUTOGROUPS {{{ -augroup configgroup - autocmd! - - " Reset cursor on start: the default cursor in normal mode is block but this - " will be overridden by any shell/terminal configuration. - autocmd VimEnter * silent !echo -en "\e[2 q" - " Remove garbage in command section due to the above line - autocmd VimEnter * redraw! - - autocmd VimEnter * highlight clear SignColumn - - " Run StripWhitespace function on write - "autocmd BufWritePre * :StripWhitespace - " Run Flake8 on write in python files - autocmd BufWritePost *.py call flake8#Flake8() - " Open pdf after entering .ly file for side-by-side - autocmd VimEnter *.ly silent ![ -f ./%:r.pdf ] && zathura %:r.pdf & - " Run lilypond after save on .ly files - autocmd BufWritePost *.ly !lilypond --silent % - - " Toggle relative number and absolute number according to focus and insert - autocmd BufEnter,FocusGained,InsertLeave * set relativenumber - autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber - - autocmd FileType rust nnoremap :RustFmt - autocmd FileType python nnoremap :Black - autocmd FileType html,htmldjango,lilypond,python,tex,plaintex,yaml setlocal foldmethod=indent - autocmd FileType python setlocal colorcolumn=80 - autocmd BufEnter Makefile,*.asm setlocal noexpandtab tabstop=6 shiftwidth=6 softtabstop=0 - autocmd BufEnter *.sh setlocal shiftwidth=2 tabstop=2 softtabstop=2 foldlevel=0 foldmethod=marker - autocmd FileType yaml setlocal shiftwidth=4 tabstop=4 softtabstop=4 - autocmd FileType vhdl setlocal shiftwidth=2 tabstop=2 softtabstop=2 - - autocmd BufRead,BufNewFile */playbooks/*.yml set filetype=yaml.ansible - autocmd BufRead,BufNewFile *.neomuttrc set filetype=neomuttrc - -augroup END -" }}} -set modelines=1 -" vim:foldmethod=marker:foldlevel=0 diff --git a/roles/neovim/tasks/main.yml b/roles/neovim/tasks/main.yml index 9055210..699e71b 100644 --- a/roles/neovim/tasks/main.yml +++ b/roles/neovim/tasks/main.yml @@ -61,87 +61,17 @@ - name: Make sure needed directories exist file: path={{ item.path }} state=directory mode={{ item.mode }} with_items: - - {path: '~/.vim', mode: '0755'} - - {path: '~/.vim/autoload', mode: '0750'} - {path: '~/.config/nvim', mode: '0755'} - {path: '~/.config/nvim/lua', mode: '0755'} -- name: Check if colors is a symlink - stat: - path: ~/.vim/colors - follow: false - register: colors_dir - -- name: Remove colors symlink - file: - path: ~/.vim/colors - state: absent - when: colors_dir.stat.exists and colors_dir.stat.islnk - - name: Copy configs copy: src={{ item.src }} dest={{ item.dest }} mode=0644 with_items: - {src: 'init.vim', dest: '~/.config/nvim/init.vim'} - {src: 'flake8', dest: '~/.flake8'} - {src: 'pylintrc', dest: '~/.pylintrc'} - - {src: 'vimrc', dest: '~/.vimrc'} - - {src: 'colors', dest: '~/.vim/'} - name: Copy lua configs copy: src: lua dest: ~/.config/nvim/ - -- name: Check if vim-plug is installed - stat: - path: ~/.vim/autoload/plug.vim - register: vimplug - -- name: Install vim-plug - get_url: - url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - dest: ~/.vim/autoload/plug.vim - mode: 0644 - when: not vimplug.stat.exists - -- name: Upgrade vim-plug - command: - cmd: vim +PlugUpgrade +qall - stdin: '\n' # On error needs user input to continue - register: result - changed_when: "'vim-plug is already up-to-date' not in result.stdout" - -- name: Install plugins - command: - cmd: vim +PlugInstall +qall - stdin: '\n' # On error needs user input to continue - register: result - changed_when: "'Resolving deltas' in result.stdout" - -- name: Update plugins - command: - cmd: vim +PlugUpdate +qall - stdin: '\n' # On error needs user input to continue - register: result - changed_when: "'files changed' in result.stdout" - -- name: Update Coc plugins - command: - cmd: vim +CocUpdate +qall - stdin: '\n' # On error needs user input to continue - register: result - changed_when: "'Updated' in result.stdout" - -- name: Upgrade Black - command: - cmd: vim +BlackUpgrade +qall - stdin: '\n' # On error needs user input to continue - register: result - # TODO: changed_when - -- name: Install hdl-checker - pip: - name: hdl-checker - extra_args: --user - register: result - changed_when: "'Running setup.py install for hdl-checker' in result.stdout"