From 42bff9956b358a66edaaa353939562eedf762ebd Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Sun, 26 Jun 2022 09:00:51 +0000 Subject: [PATCH] [nvim] Add neovim checks --- nvim/dotfiles/plugins-list.vim | 49 ++++++++++++++++++++-------------- nvim/init.vim | 18 ++++++++++++- 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/nvim/dotfiles/plugins-list.vim b/nvim/dotfiles/plugins-list.vim index 6879df1..93a1b3b 100644 --- a/nvim/dotfiles/plugins-list.vim +++ b/nvim/dotfiles/plugins-list.vim @@ -1,48 +1,57 @@ let s:plug = funcref('dotfiles#plugman#register') " UI {{{ - call s:plug('romgrk/barbar.nvim') - call s:plug('hoob3rt/lualine.nvim') + if has('nvim') + call s:plug('romgrk/barbar.nvim') + call s:plug('hoob3rt/lualine.nvim') + endif " }}} " Navigation {{{ - call s:plug('nvim-telescope/telescope.nvim') " dependencies {{{ - call s:plug('nvim-lua/plenary.nvim') - " }}} + if has('nvim') + call s:plug('nvim-telescope/telescope.nvim') " dependencies {{{ + call s:plug('nvim-lua/plenary.nvim') + " }}} + endif " }}} " Files {{{ + if has('nvim') + call s:plug('kyazdani42/nvim-web-devicons') + call s:plug('akinsho/nvim-toggleterm.lua') + endif call s:plug('preservim/nerdtree') - call s:plug('kyazdani42/nvim-web-devicons') - call s:plug('akinsho/nvim-toggleterm.lua') call s:plug('antoyo/vim-licenses') " }}} " Language specific {{{ - call s:plug('alaviss/nim.nvim') + if has('nvim') + call s:plug('xiyaowong/coc-nvim-lua') + call s:plug('alaviss/nim.nvim') + if has('unix') + call s:plug('nvim-neorg/neorg', { 'branch': 'unstable' }) " dependencies {{{ + call s:plug('nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' }) + " }}} + endif + endif call s:plug('stevearc/vim-arduino') - call s:plug('xiyaowong/coc-nvim-lua') call s:plug('luke-gru/vim-riml') call s:plug('bhurlow/vim-parinfer') call s:plug('vim-scripts/newlisp') - if has('unix') - call s:plug('nvim-neorg/neorg', { 'branch': 'unstable' }) " dependencies {{{ - call s:plug('nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' }) - " }}} - endif call s:plug('noahfrederick/vim-laravel') " dependencies {{{ call s:plug('noahfrederick/vim-composer') call s:plug('tpope/vim-projectionist') call s:plug('tpope/vim-dispatch') " }}} - " }}} " Misc {{{ - call s:plug('junegunn/vader.vim') - call s:plug('andweeb/presence.nvim') - call s:plug('wakatime/vim-wakatime') - if has('nvim-0.6.0') - call s:plug('github/copilot.vim') + if has('nvim') + call s:plug('andweeb/presence.nvim') + if has('nvim-0.6.0') + call s:plug('github/copilot.vim') + endif endif + call s:plug('junegunn/vader.vim') + call s:plug('wakatime/vim-wakatime') " }}} diff --git a/nvim/init.vim b/nvim/init.vim index 1eeaf5e..6277f37 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -6,4 +6,20 @@ let g:vim_ide = 1 let g:dotfiles_rainbow_indent_opacity = 0.5 source :p:h/../dmitmel-dotfiles/nvim/init.vim -luafile :p:h/init.lua + +if has('nvim') + luafile :p:h/init.lua +else + set termguicolors +endif + +" Arrow key fix kanged from {{{ + if g:HELP_MY_ARROW_KEYS_ARE_BROKEN + " the following simply creates an ambiguous mapping so vim fully + " processes the escape sequence for terminal keys, see 'ttimeout' for a + " rough explanation, this just forces it to work + if &term[:4] == "xterm" || &term[:5] == 'screen' || &term[:3] == 'rxvt' + inoremap OC + endif + endif +" }}}