From 3b0142cedcde39e4c2097ecd916a870a3ced5ec6 Mon Sep 17 00:00:00 2001 From: Vito Graffagnino Date: Tue, 8 Sep 2020 18:10:49 +0100 Subject: Added the relevent parts of the .config directory. Alss add ssh config --- .config/new_neovim/coc-settings.json | 73 +++++++++++++ .config/new_neovim/general/functions.vim | 9 ++ .config/new_neovim/general/paths.vim | 4 + .config/new_neovim/general/settings.vim | 43 ++++++++ .config/new_neovim/init.vim | 8 ++ .config/new_neovim/keys/mappings.vim | 73 +++++++++++++ .config/new_neovim/keys/which-key.vim | 170 +++++++++++++++++++++++++++++++ .config/new_neovim/plug-config/coc.vim | 157 ++++++++++++++++++++++++++++ .config/new_neovim/themes/airline.vim | 34 +++++++ .config/new_neovim/themes/onedark.vim | 23 +++++ .config/new_neovim/vim-plug/plugins.vim | 49 +++++++++ 11 files changed, 643 insertions(+) create mode 100644 .config/new_neovim/coc-settings.json create mode 100644 .config/new_neovim/general/functions.vim create mode 100644 .config/new_neovim/general/paths.vim create mode 100644 .config/new_neovim/general/settings.vim create mode 100644 .config/new_neovim/init.vim create mode 100644 .config/new_neovim/keys/mappings.vim create mode 100644 .config/new_neovim/keys/which-key.vim create mode 100644 .config/new_neovim/plug-config/coc.vim create mode 100644 .config/new_neovim/themes/airline.vim create mode 100644 .config/new_neovim/themes/onedark.vim create mode 100644 .config/new_neovim/vim-plug/plugins.vim (limited to '.config/new_neovim') diff --git a/.config/new_neovim/coc-settings.json b/.config/new_neovim/coc-settings.json new file mode 100644 index 0000000..a11d575 --- /dev/null +++ b/.config/new_neovim/coc-settings.json @@ -0,0 +1,73 @@ +{ + // suggestions + // "suggest.echodocSupport": true, + // TODO add more labels and give them cool glyphs + "suggest.completionItemKindLabels": { + "text": "t", + "method": "m", + "function": "f" + }, + + // diagnostics + "diagnostic.errorSign": "✗", + "diagnostic.warningSign": "⚠", + "diagnostic.infoSign": "", + "diagnostic.hintSign": " ", + // "diagnostic.displayByAle": true, + + // codelens TODO what does this get me? + // "codeLens.enable": true, + + // list + "list.indicator": ">", + "list.selectedSignText": " ", + + // autoformat + "coc.preferences.formatOnSaveFiletypes": [ + "css", + "markdown", + "javascript", + "html", + "yaml", + "json", + "python" + ], + "coc.preferences.hoverTarget": "float", + + // python config + "python.linting.enabled": true, + "python.linting.pylintEnabled": true, + + // snippets + "snippets.ultisnips.directories": ["UltiSnips", "~/.config/nvim/utils/snips"], + + // explorer + "explorer.width": 30, + "explorer.icon.enableNerdfont": true, + "explorer.previewAction.onHover": false, + "explorer.icon.enableVimDevicons": false, + "explorer.keyMappings": { + "": ["expandable?", "expand", "open"], + "v": "open:vsplit" + }, + + "languageserver": { + "bash": { + "command": "bash-language-server", + "args": ["start"], + "filetypes": ["sh"], + "ignoredRootPaths": ["~"] + }, + "clangd": { + "command": "clangd", + "rootPatterns": ["compile_flags.txt", "compile_commands.json"], + "filetypes": ["c", "cc", "cpp", "c++", "objc", "objcpp"] + } + + } + + // TODO language servers + // TODO g:coc_global_extensions + // TODO b:coc_suggest_disable=1 GOYO + // TODO add to paths.vim g:coc_node_path +} diff --git a/.config/new_neovim/general/functions.vim b/.config/new_neovim/general/functions.vim new file mode 100644 index 0000000..58db6b1 --- /dev/null +++ b/.config/new_neovim/general/functions.vim @@ -0,0 +1,9 @@ +" Turn spellcheck on for markdown files +augroup auto_spellcheck + autocmd BufNewFile,BufRead *.md setlocal spell +augroup END + +" Remove trailing whitespaces automatically before save +" augroup strip_ws +" autocmd BufWritePre * call utils#stripTrailingWhitespaces() +" augroup END diff --git a/.config/new_neovim/general/paths.vim b/.config/new_neovim/general/paths.vim new file mode 100644 index 0000000..12ba27c --- /dev/null +++ b/.config/new_neovim/general/paths.vim @@ -0,0 +1,4 @@ +let g:ruby_host_prog='rvm system do neovim-ruby-host' +let g:python_host_prog='/usr/bin/python2' +let g:python3_host_prog='/usr/bin/python3' + diff --git a/.config/new_neovim/general/settings.vim b/.config/new_neovim/general/settings.vim new file mode 100644 index 0000000..751b725 --- /dev/null +++ b/.config/new_neovim/general/settings.vim @@ -0,0 +1,43 @@ +set iskeyword+=- " treat dash separated words as a word text object" +set formatoptions-=cro " Stop newline continution of comments + +syntax enable " Enables syntax highlighing +set hidden " Required to keep multiple buffers open multiple buffers +set nowrap " Display long lines as just one line +set encoding=utf-8 " The encoding displayed +set pumheight=10 " Makes popup menu smaller +set fileencoding=utf-8 " The encoding written to file +set ruler " Show the cursor position all the time +set cmdheight=2 " More space for displaying messages +set splitbelow " Horizontal splits will automatically be below +set splitright " Vertical splits will automatically be to the right +set t_Co=256 " Support 256 colors +set conceallevel=0 " So that I can see `` in markdown files +set tabstop=2 " Insert 2 spaces for a tab +set shiftwidth=2 " Change the number of space characters inserted for indentation +set smarttab " Makes tabbing smarter will realize you have 2 vs 4 +set expandtab " Converts tabs to spaces +set smartindent " Makes indenting smart +set autoindent " Good auto indent +set laststatus=2 " Always display the status line +set number relativenumber " Line numbers +set cursorline " Enable highlighting of the current line +set background=dark " tell vim what the background color looks like +set noshowmode " We don't need to see things like -- INSERT -- anymore +set nobackup " This is recommended by coc +set nowritebackup " This is recommended by coc +set shortmess+=c " Don't pass messages to |ins-completion-menu|. +set signcolumn=yes " Always show the signcolumn, otherwise it would shift the text each time +set updatetime=300 " Faster completion +set timeoutlen=100 " By default timeoutlen is 1000 ms +set clipboard=unnamedplus " Copy paste between vim and everything else +set incsearch + +" au! BufWritePost $MYVIMRC source % " auto source when writing to init.vm alternatively you can run :source $MYVIMRC +autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o + + +"If you forget to sudo before calling vim use the following to be +"able to write the file. +cnoremap w!! %!sudo tee > /dev/null % + diff --git a/.config/new_neovim/init.vim b/.config/new_neovim/init.vim new file mode 100644 index 0000000..10ad6a0 --- /dev/null +++ b/.config/new_neovim/init.vim @@ -0,0 +1,8 @@ +BASENAME='/home/archlinux/vgg/.config/new_neovim' +source $BASENAME/vim-plug/plugins.vim +source $BASENAME/general/settings.vim +source $BASENAME/keys/mappings.vim +source $BASENAME/themes/onedark.vim +source $BASENAME/themes/airline.vim + + diff --git a/.config/new_neovim/keys/mappings.vim b/.config/new_neovim/keys/mappings.vim new file mode 100644 index 0000000..929414b --- /dev/null +++ b/.config/new_neovim/keys/mappings.vim @@ -0,0 +1,73 @@ +" g Leader key +let mapleader="," +let localleader=",," +nnoremap +map v :edit $MYVIMRC + +" Better indenting +vnoremap < >gv + +" Better nav for omnicomplete +inoremap ("\") +inoremap ("\") + +" TAB in general mode will move to text buffer +nnoremap :bnext +" SHIFT-TAB will go back +nnoremap :bprevious + +" Use control-c instead of escape +nnoremap +" : completion. +inoremap pumvisible() ? "\" : "\" + +" Better window navigation +nnoremap h +nnoremap j +nnoremap k +nnoremap l + +" Use alt + hjkl to resize windows +nnoremap :resize -2 +nnoremap :resize +2 +nnoremap :vertical resize -2 +nnoremap :vertical resize +2 + +" Copy selected text to system clipboard (requires gvim/nvim/vim-x11 installed): +vnoremap "+y +map "+P + +" Binary File Settings ---- {{{ +" +" Hex read +nmap hr :%!xxd :set filetype=xxd +" Hex write +nmap hw :%!xxd -r :set binary :set filetype=xxd +" +" }}} +" Info Pages Settings ----- {{{ +" +" Set up the reading of info from within vim (use :Info whatever) + +nnoremap :exe ":Info ".expand("") + +" +" }}} +" Terminal Emulator ----- {{{ +" +" +tnoremap + +" Usel alt+hjkl to move between windows + +tnoremap h +tnoremap j +tnoremap k +tnoremap l +nnoremap h +nnoremap j +nnoremap k +nnoremap l +" +" }}} diff --git a/.config/new_neovim/keys/which-key.vim b/.config/new_neovim/keys/which-key.vim new file mode 100644 index 0000000..87eda18 --- /dev/null +++ b/.config/new_neovim/keys/which-key.vim @@ -0,0 +1,170 @@ +" Map leader to which_key +nnoremap :silent WhichKey '' +vnoremap :silent :silent WhichKeyVisual '' + +" Create map to add keys to +let g:which_key_map = {} +" Define a separator +let g:which_key_sep = '→' +" set timeoutlen=100 + + +" Not a fan of floating windows for this +let g:which_key_use_floating_win = 0 + +" Change the colors if you want +highlight default link WhichKey Operator +highlight default link WhichKeySeperator DiffAdded +highlight default link WhichKeyGroup Identifier +highlight default link WhichKeyDesc Function + +" Hide status line +autocmd! FileType which_key +autocmd FileType which_key set laststatus=0 noshowmode noruler + \| autocmd BufLeave set laststatus=2 noshowmode ruler + +" Single mappings +let g:which_key_map['/'] = [ 'NERDCommenterToggle' , 'comment' ] +let g:which_key_map['.'] = [ ':e $MYVIMRC' , 'open init' ] +let g:which_key_map[';'] = [ ':Commands' , 'commands' ] +let g:which_key_map['='] = [ '=' , 'balance windows' ] +let g:which_key_map[','] = [ 'Startify' , 'start screen' ] +let g:which_key_map['d'] = [ ':bd' , 'delete buffer'] +let g:which_key_map['e'] = [ ':CocCommand explorer' , 'explorer' ] +let g:which_key_map['f'] = [ ':Files' , 'search files' ] +let g:which_key_map['h'] = [ 's' , 'split below'] +let g:which_key_map['q'] = [ 'q' , 'quit' ] +let g:which_key_map['r'] = [ ':RnvimrToggle' , 'ranger' ] +let g:which_key_map['S'] = [ ':SSave' , 'save session' ] +let g:which_key_map['T'] = [ ':Rg' , 'search text' ] +let g:which_key_map['v'] = [ 'v' , 'split right'] +let g:which_key_map['w'] = [ 'w' , 'write' ] +let g:which_key_map['z'] = [ 'Goyo' , 'zen' ] + +" Group mappings + +" b is for buffer +let g:which_key_map.b = { + \ 'name' : '+buffer' , + \ '1' : ['b1' , 'buffer 1'] , + \ '2' : ['b2' , 'buffer 2'] , + \ 'd' : ['bd' , 'delete-buffer'] , + \ 'f' : ['bfirst' , 'first-buffer'] , + \ 'h' : ['Startify' , 'home-buffer'] , + \ 'l' : ['blast' , 'last-buffer'] , + \ 'n' : ['bnext' , 'next-buffer'] , + \ 'p' : ['bprevious' , 'previous-buffer'] , + \ '?' : ['Buffers' , 'fzf-buffer'] , + \ } + +" s is for search +let g:which_key_map.s = { + \ 'name' : '+search' , + \ '/' : [':History/' , 'history'], + \ ';' : [':Commands' , 'commands'], + \ 'a' : [':Ag' , 'text Ag'], + \ 'b' : [':BLines' , 'current buffer'], + \ 'B' : [':Buffers' , 'open buffers'], + \ 'c' : [':Commits' , 'commits'], + \ 'C' : [':BCommits' , 'buffer commits'], + \ 'f' : [':Files' , 'files'], + \ 'g' : [':GFiles' , 'git files'], + \ 'G' : [':GFiles?' , 'modified git files'], + \ 'h' : [':History' , 'file history'], + \ 'H' : [':History:' , 'command history'], + \ 'l' : [':Lines' , 'lines'] , + \ 'm' : [':Marks' , 'marks'] , + \ 'M' : [':Maps' , 'normal maps'] , + \ 'p' : [':Helptags' , 'help tags'] , + \ 'P' : [':Tags' , 'project tags'], + \ 's' : [':Snippets' , 'snippets'], + \ 'S' : [':Colors' , 'color schemes'], + \ 't' : [':Rg' , 'text Rg'], + \ 'T' : [':BTags' , 'buffer tags'], + \ 'w' : [':Windows' , 'search windows'], + \ 'y' : [':Filetypes' , 'file types'], + \ 'z' : [':FZF' , 'FZF'], + \ } + +" g is for git +let g:which_key_map.g = { + \ 'name' : '+git' , + \ 'a' : [':Git add .' , 'add all'], + \ 'A' : [':Git add %' , 'add current'], + \ 'b' : [':Git blame' , 'blame'], + \ 'B' : [':GBrowse' , 'browse'], + \ 'c' : [':Git commit -m "autocommit"' , 'commit'], + \ 'd' : [':Git diff' , 'diff'], + \ 'D' : [':Gdiffsplit' , 'diff split'], + \ 'g' : [':GGrep' , 'git grep'], + \ 'G' : [':Gstatus' , 'status'], + \ 'h' : [':GitGutterLineHighlightsToggle' , 'highlight hunks'], + \ 'H' : ['(GitGutterPreviewHunk)' , 'preview hunk'], + \ 'j' : ['(GitGutterNextHunk)' , 'next hunk'], + \ 'k' : ['(GitGutterPrevHunk)' , 'prev hunk'], + \ 'l' : [':Git log' , 'log'], + \ 'p' : [':Git push' , 'push'], + \ 'P' : [':Git pull' , 'pull'], + \ 'r' : [':GRemove' , 'remove'], + \ 's' : ['(GitGutterStageHunk)' , 'stage hunk'], + \ 't' : [':GitGutterSignsToggle' , 'toggle signs'], + \ 'u' : ['(GitGutterUndoHunk)' , 'undo hunk'], + \ 'v' : [':GV' , 'view commits'], + \ 'V' : [':GV!' , 'view buffer commits'], + \ } + +" l is for language server protocol +let g:which_key_map.l = { + \ 'name' : '+lsp' , + \ '.' : [':CocConfig' , 'config'], + \ ';' : ['(coc-refactor)' , 'refactor'], + \ 'a' : ['(coc-codeaction)' , 'line action'], + \ 'A' : ['(coc-codeaction-selected)' , 'selected action'], + \ 'b' : [':CocNext' , 'next action'], + \ 'B' : [':CocPrev' , 'prev action'], + \ 'c' : [':CocList commands' , 'commands'], + \ 'd' : ['(coc-definition)' , 'definition'], + \ 'D' : ['(coc-declaration)' , 'declaration'], + \ 'e' : [':CocList extensions' , 'extensions'], + \ 'f' : ['(coc-format-selected)' , 'format selected'], + \ 'F' : ['(coc-format)' , 'format'], + \ 'h' : ['(coc-float-hide)' , 'hide'], + \ 'i' : ['(coc-implementation)' , 'implementation'], + \ 'I' : [':CocList diagnostics' , 'diagnostics'], + \ 'j' : ['(coc-float-jump)' , 'float jump'], + \ 'l' : ['(coc-codelens-action)' , 'code lens'], + \ 'n' : ['(coc-diagnostic-next)' , 'next diagnostic'], + \ 'N' : ['(coc-diagnostic-next-error)' , 'next error'], + \ 'o' : ['(coc-openlink)' , 'open link'], + \ 'O' : [':CocList outline' , 'outline'], + \ 'p' : ['(coc-diagnostic-prev)' , 'prev diagnostic'], + \ 'P' : ['(coc-diagnostic-prev-error)' , 'prev error'], + \ 'q' : ['(coc-fix-current)' , 'quickfix'], + \ 'r' : ['(coc-rename)' , 'rename'], + \ 'R' : ['(coc-references)' , 'references'], + \ 's' : [':CocList -I symbols' , 'references'], + \ 't' : ['(coc-type-definition)' , 'type definition'], + \ 'u' : [':CocListResume' , 'resume list'], + \ 'U' : [':CocUpdate' , 'update CoC'], + \ 'v' : [':Vista!!' , 'tag viewer'], + \ 'z' : [':CocDisable' , 'disable CoC'], + \ 'Z' : [':CocEnable' , 'enable CoC'], + \ } + + +" t is for toggle +let g:which_key_map.t = { + \ 'name' : '+toggle' , + \ 'c' : [':ColorizerToggle' , 'colorizer'], + \ 'e' : [':CocCommand explorer' , 'explorer'], + \ 'n' : [':set nonumber!' , 'line-numbers'], + \ 'r' : [':set norelativenumber!' , 'relative line nums'], + \ 's' : [':let @/ = ""' , 'remove search highlight'], + \ 't' : [':FloatermToggle' , 'terminal'], + \ 'v' : [':Vista!!' , 'tag viewer'], + \ } + +" Register which key map +call which_key#register('', "g:which_key_map") + + diff --git a/.config/new_neovim/plug-config/coc.vim b/.config/new_neovim/plug-config/coc.vim new file mode 100644 index 0000000..709f971 --- /dev/null +++ b/.config/new_neovim/plug-config/coc.vim @@ -0,0 +1,157 @@ + " let g:coc_global_extensions = [ + " \ 'coc-snippets', + " \ 'coc-actions', + " \ 'coc-emmet', + " \ 'coc-pairs', + " \ 'coc-tsserver', + " \ 'coc-floaterm', + " \ 'coc-html', + " \ 'coc-css', + " \ 'coc-cssmodules', + " \ 'coc-yaml', + " \ 'coc-python', + " \ 'coc-explorer', + " \ 'coc-svg', + " \ 'coc-prettier', + " \ 'coc-vimlsp', + " \ 'coc-flutter', + " \ 'coc-xml', + " \ 'coc-yank', + " \ 'coc-json', + " \ 'coc-vimtex', + " \ ] + +" Use tab for trigger completion with characters ahead and navigate. +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use to trigger completion. +inoremap coc#refresh() + +" Use to confirm completion, `u` means break undo chain at current +" position. Coc only does snippet and additional edit on confirm. +if exists('*complete_info') + inoremap complete_info()["selected"] != "-1" ? "\" : "\u\" +else + imap pumvisible() ? "\" : "\u\" +endif + +" GoTo code navigation. +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +" Use K to show documentation in preview window. +nnoremap K :call show_documentation() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + else + call CocAction('doHover') + endif +endfunction + +" Highlight the symbol and its references when holding the cursor. +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Symbol renaming. +" nmap rn (coc-rename) + +augroup mygroup + autocmd! + " Setup formatexpr specified filetype(s). + autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') + " Update signature help on jump placeholder. + autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') +augroup end + +" Applying codeAction to the selected region. +" Example: `aap` for current paragraph +" xmap a (coc-codeaction-selected) +" nmap a (coc-codeaction-selected) + +" Remap keys for applying codeAction to the current line. +" nmap ac (coc-codeaction) +" Apply AutoFix to problem on the current line. +" nmap qf (coc-fix-current) + +" Introduce function text object +" NOTE: Requires 'textDocument.documentSymbol' support from the language server. +xmap if (coc-funcobj-i) +xmap af (coc-funcobj-a) +omap if (coc-funcobj-i) +omap af (coc-funcobj-a) + +" Use for selections ranges. +" NOTE: Requires 'textDocument/selectionRange' support from the language server. +" coc-tsserver, coc-python are the examples of servers that support it. +" nmap (coc-range-select) +" xmap (coc-range-select) + +" Add `:Format` command to format current buffer. +command! -nargs=0 Format :call CocAction('format') + +" Add `:Fold` command to fold current buffer. +command! -nargs=? Fold :call CocAction('fold', ) + +" Add `:OR` command for organize imports of the current buffer. +command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') + +" Add (Neo)Vim's native statusline support. +" NOTE: Please see `:h coc-status` for integrations with external plugins that +" provide custom statusline: lightline.vim, vim-airline. +set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} + +" Mappings using CoCList: +" Show all diagnostics. +" TODO add these to which key +" nnoremap a :CocList diagnostics +" " Manage extensions. +" nnoremap e :CocList extensions +" " Show commands. +" nnoremap c :CocList commands +" " Find symbol of current document. +" nnoremap o :CocList outline +" " Search workspace symbols. +" nnoremap s :CocList -I symbols +" " Do default action for next item. +" nnoremap j :CocNext +" " Do default action for previous item. +" nnoremap k :CocPrev +" " Resume latest coc list. +" nnoremap p :CocListResume + +" Explorer +let g:coc_explorer_global_presets = { +\ 'floating': { +\ 'position': 'floating', +\ }, +\ 'floatingLeftside': { +\ 'position': 'floating', +\ 'floating-position': 'left-center', +\ 'floating-width': 30, +\ }, +\ 'floatingRightside': { +\ 'position': 'floating', +\ 'floating-position': 'right-center', +\ 'floating-width': 30, +\ }, +\ 'simplify': { +\ 'file.child.template': '[selection | clip | 1] [indent][icon | 1] [filename omitCenter 1]' +\ } +\ } +"nmap e :CocCommand explorer +" nnoremap e :CocCommand explorer +" nmap f :CocCommand explorer --preset floatingRightside +autocmd BufEnter * if (winnr("$") == 1 && &filetype == 'coc-explorer') | q | endif + diff --git a/.config/new_neovim/themes/airline.vim b/.config/new_neovim/themes/airline.vim new file mode 100644 index 0000000..80fad2e --- /dev/null +++ b/.config/new_neovim/themes/airline.vim @@ -0,0 +1,34 @@ +"let g:airline_theme='luna' +let g:airline_theme='onedark' + +if !exists('g:airline_symbols') + let g:airline_symbols = {} +endif + +let g:airline_powerline_fonts = 1 + " unicode symbols +let g:airline_left_sep = '▶' +let g:airline_right_sep = '◀' +let g:airline_symbols.crypt = '🔒' +let g:airline_symbols.linenr = '☰' +let g:airline_symbols.maxlinenr = '㏑' +let g:airline_symbols.branch = '⎇' +let g:airline_symbols.paste = 'Þ' +let g:airline_symbols.spell = 'Ꞩ' +let g:airline_symbols.notexists = 'Ɇ' +let g:airline_symbols.whitespace = 'Ξ' +let g:powerline_pycmd='py3' + +" enable tabline +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#left_sep = '▶' +let g:airline#extensions#tabline#right_sep = '◀' + +set showtabline 2 + +set timeoutlen=300 ttimeoutlen=0 +set laststatus=2 " always display the status line +set statusline=%F "Full path to the file +set statusline+=\ -\ "Separator +set statusline+=%-4{fugitive#statusline()} "If using git, show branch being used + diff --git a/.config/new_neovim/themes/onedark.vim b/.config/new_neovim/themes/onedark.vim new file mode 100644 index 0000000..99ad7bb --- /dev/null +++ b/.config/new_neovim/themes/onedark.vim @@ -0,0 +1,23 @@ +" onedark.vim override: Don't set a background color when running in a terminal; +if (has("autocmd") && !has("gui_running")) + augroup colorset + autocmd! + let s:white = { "gui": "#ABB2BF", "cterm": "145", "cterm16" : "7" } + autocmd ColorScheme * call onedark#set_highlight("Normal", { "fg": s:white }) " `bg` will not be styled since there is no `bg` setting + augroup END +endif + +hi Comment cterm=italic +let g:onedark_hide_endofbuffer=1 +let g:onedark_terminal_italics=1 +let g:onedark_termcolors=256 + +syntax on +colorscheme onedark + + +" checks if your terminal has 24-bit color support +if (has("termguicolors")) + set termguicolors + hi LineNr ctermbg=NONE guibg=NONE +endif diff --git a/.config/new_neovim/vim-plug/plugins.vim b/.config/new_neovim/vim-plug/plugins.vim new file mode 100644 index 0000000..d569804 --- /dev/null +++ b/.config/new_neovim/vim-plug/plugins.vim @@ -0,0 +1,49 @@ +" auto-install vim-plug + +if ! filereadable(expand('~/.config/new_neovim/autoload/plug.vim')) + echo "Downloading junegunn/vim-plug to manage plugins..." + silent !mkdir -p ~/.config/nvim/autoload/ + silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ~/.config/nvim/autoload/plug.vim +endif + +call plug#begin('~/.config/new_neovim/plugged') +Plug 'alok/notational-fzf-vim' +Plug 'dbeniamine/cheat.sh-vim' +Plug 'dbeniamine/vim-mail' +Plug 'honza/vim-snippets' +Plug 'jalvesaq/Nvim-R' +Plug 'jalvesaq/vimcmdline' +Plug 'jceb/vim-orgmode' +Plug 'jnurmine/Zenburn' +Plug 'joshdick/onedark.vim' +Plug 'junegunn/fzf.vim' +Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +Plug 'junegunn/goyo.vim' +Plug 'junegunn/Limelight.vim' +Plug 'liuchengxu/vim-which-key' " See what keys do like in emacs +Plug 'morhetz/gruvbox' +Plug 'nelstrom/vim-markdown-preview' +Plug 'neoclide/coc.nvim', {'branch': 'release'} +Plug 'pangloss/vim-javascript' +Plug 'PotatoesMaster/i3-vim-syntax' +Plug 'scrooloose/nerdtree' +Plug 'scrooloose/nerdcommenter' " Comment stuff out +Plug 'sheerun/vim-polyglot' +Plug 'SirVer/ultisnips' +Plug 'suan/vim-instant-markdown', {'for': 'markdown'} +Plug 'szymonmaszke/vimpyter' +Plug 'terryma/vim-multiple-cursors' +Plug 'tmhedberg/SimpylFold' +Plug 'tpope/timl' +Plug 'tpope/vim-markdown' +Plug 'tpope/vim-surround' +Plug 'tpope/vim-fugitive' +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' +Plug 'vim-latex/vim-latex' +Plug 'vifm/vifm.vim' +Plug 'vimwiki/vimwiki' +Plug 'voldikss/vim-floaterm' +Plug 'xuhdev/vim-latex-live-preview' +call plug#end() + -- cgit v1.2.3