From ea75e570fe585156e328ba5cbf04caac209e365b Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Fri, 12 Nov 2021 19:24:39 +0300 Subject: [PATCH] Remove old neovim config --- config/nvim/coc-settings.json | 35 ----------------- config/nvim/coc.vim | 72 ----------------------------------- config/nvim/file-tree.vim | 32 ---------------- config/nvim/general.vim | 26 ------------- config/nvim/git.vim | 21 ---------- config/nvim/init.vim | 37 ------------------ config/nvim/plugins.vim | 23 ----------- config/nvim/remaps.vim | 47 ----------------------- config/nvim/tabs.vim | 19 --------- config/nvim/terminal.vim | 2 - config/nvim/theme.vim | 7 ---- 11 files changed, 321 deletions(-) delete mode 100644 config/nvim/coc-settings.json delete mode 100644 config/nvim/coc.vim delete mode 100644 config/nvim/file-tree.vim delete mode 100644 config/nvim/general.vim delete mode 100644 config/nvim/git.vim delete mode 100644 config/nvim/init.vim delete mode 100644 config/nvim/plugins.vim delete mode 100644 config/nvim/remaps.vim delete mode 100644 config/nvim/tabs.vim delete mode 100644 config/nvim/terminal.vim delete mode 100644 config/nvim/theme.vim diff --git a/config/nvim/coc-settings.json b/config/nvim/coc-settings.json deleted file mode 100644 index 763a9bd..0000000 --- a/config/nvim/coc-settings.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "coc.preferences.formatOnSaveFiletypes": [ - "css", - "markdown", - "javascript", - "typescript", - "svelte", - "javascriptreact", - "typescriptreact", - "json", - "jsonc", - "rust" - ], - "python.jediEnabled": false, - "coc.source.emoji.filetypes": [ - "markdown", - "javascript", - "typescript", - "javascriptreact", - "typescriptreact", - "python", - "go", - "svelte" - ], - "svelte.plugin.svelte.completions.enable": true, - "svelte.plugin.css.completions.enable": true, - "svelte.plugin.svelte.enable": true, - "svelte.plugin.html.enable": true, - "svelte.plugin.css.enable": true, - "svelte.enable-ts-plugin": true, - "svelte.plugin.svelte.format.enable": true, - "html.filetypes": ["html", "javascriptreact", "typescriptreact"], - "rust.all_features": true, - "rust-client.updateOnStartup": true -} diff --git a/config/nvim/coc.vim b/config/nvim/coc.vim deleted file mode 100644 index c34610e..0000000 --- a/config/nvim/coc.vim +++ /dev/null @@ -1,72 +0,0 @@ -" Always show the signcolumn, otherwise it would shift the text each time -" diagnostics appear/become resolved. -if has("nvim-0.5.0") || has("patch-8.1.1564") - " Recently vim can merge signcolumn and number column into one - set signcolumn=number -else - set signcolumn=yes -endif - -" 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. -if has('nvim') - inoremap coc#refresh() -else - inoremap coc#refresh() -endif - -" GoTo definition -nmap gd (coc-definition) - -" Use for trigger snippet expand. -imap (coc-snippets-expand) - -" Use F2 to rename a variable, e.g. -nmap (coc-rename) - -let g:coc_global_extensions = [ - \ 'coc-tsserver', - \ 'coc-css', - \ 'coc-go', - \ 'coc-html', - \ 'coc-prettier', - \ 'coc-sh', - \ 'coc-svelte', - \ 'coc-pairs', - \ 'coc-json', - \ 'coc-snippets', - \ 'coc-emmet', - \ 'coc-highlight', - \ 'coc-python', - \ 'coc-emoji', - \ 'coc-toml', - \ 'coc-rls' - \ ] - -" Use to confirm completion, `u` means break undo chain at current position. -" Coc only does snippet and additional edit on confirm. -inoremap pumvisible() ? "\" : "\u\" - -command! -nargs=0 Prettier :CocCommand prettier.formatFile - -" 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 diff --git a/config/nvim/file-tree.vim b/config/nvim/file-tree.vim deleted file mode 100644 index 0607b18..0000000 --- a/config/nvim/file-tree.vim +++ /dev/null @@ -1,32 +0,0 @@ -lua << EOF - require("nvim-tree").setup({ - open_on_setup = true, - hijack_cursor = true, - indent_markers = true, - update_cwd = true, - update_focused_file = { - enable = true - }, - view = { - width = 30, - side = "left", - auto_resize = true - }, - filters = { - custom = {".git"} - } - }) -EOF - -let g:nvim_tree_add_trailing = 1 -let g:nvim_tree_indent_markers = 1 -let g:nvim_tree_show_icons = { - \ 'git': 0, - \ 'folders': 0, - \ 'files': 0, - \ 'folder_arrows': 0, - \ } - -" Remaps -nnoremap b :NvimTreeToggle -nnoremap r :NvimTreeRefresh diff --git a/config/nvim/general.vim b/config/nvim/general.vim deleted file mode 100644 index b0809bb..0000000 --- a/config/nvim/general.vim +++ /dev/null @@ -1,26 +0,0 @@ -syntax on - -set tabstop=2 -set shiftwidth=2 -set expandtab - -set number -set relativenumber -set wrap -set noswapfile -set encoding=utf-8 -set hidden -set nowritebackup -set cmdheight=2 -set updatetime=300 -set shortmess+=c -set mouse=a " nv for normal and visual only -set cursorline -set clipboard+=unnamedplus -set splitright -set splitbelow - -set termguicolors - -" MY LEADER KEY IS GONNA BE A SPACE -let mapleader = " " diff --git a/config/nvim/git.vim b/config/nvim/git.vim deleted file mode 100644 index c02df16..0000000 --- a/config/nvim/git.vim +++ /dev/null @@ -1,21 +0,0 @@ -lua << EOF - require("gitsigns").setup { - signcolumn = false, - current_line_blame = true, - current_line_blame_opts = { - virt_text = true, - virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' - delay = 500, - } - } -EOF - -" Remap to toggle gitsigns as linehl -nnoremap sg :Gitsigns toggle_linehl - -" Open Gitabra -nnoremap gg :G - -nnoremap gs :Gitsigns stage_hunk -nnoremap gu :Gitsigns undo_stage_hunk -nnoremap gc :!git commit diff --git a/config/nvim/init.vim b/config/nvim/init.vim deleted file mode 100644 index d197dab..0000000 --- a/config/nvim/init.vim +++ /dev/null @@ -1,37 +0,0 @@ -source $HOME/.config/nvim/plugins.vim -source $HOME/.config/nvim/general.vim -source $HOME/.config/nvim/remaps.vim -source $HOME/.config/nvim/theme.vim -source $HOME/.config/nvim/file-tree.vim -source $HOME/.config/nvim/coc.vim -source $HOME/.config/nvim/tabs.vim -source $HOME/.config/nvim/git.vim - -" Filetypes for markdown extension -let g:mkdp_filetypes = ['md', 'mdx', 'markdown'] - -let g:svelte_preprocessors = ['typescript', 'scss'] - -let g:closetag_filenames = '*.html,*.svelte,*.jsx,*.tsx' -let g:closetag_regions = { - \ 'typescript.tsx': 'jsxRegion,tsxRegion', - \ 'javascript.jsx': 'jsxRegion', - \ 'typescriptreact': 'jsxRegion,tsxRegion', - \ 'javascriptreact': 'jsxRegion', - \ } - -lua <w :w -nnoremap q :q - -" Remaps to move line under the cursor up and down -nnoremap :m .-2== -nnoremap :m .+1== -vnoremap K :m '<-2gv=gv -vnoremap J :m '>+1gv=gv - -" Move split panes to left/bottom/top/right -nnoremap H -nnoremap J -nnoremap K -nnoremap L - -" move between panes to left/bottom/top/right -nnoremap h h -nnoremap j j -nnoremap k k -nnoremap l l -tnoremap h -tnoremap j -tnoremap k -tnoremap l - -" Remove search highlighting -noremap nh :nohl - -" Open terminal -nnoremap t :ToggleTerminal - -" Use Escape to go to normal mode -tnoremap - -" Open splits -nnoremap sv :vs -nnoremap sh :sp - -" Use Ctrl+Shift+hjkl to resize panes -nnoremap :resize -2 -nnoremap :resize +2 -nnoremap :vert resize -10 -nnoremap :vert resize +10 - -" Telescope -nnoremap f :Telescope find_files diff --git a/config/nvim/tabs.vim b/config/nvim/tabs.vim deleted file mode 100644 index 0e21bd2..0000000 --- a/config/nvim/tabs.vim +++ /dev/null @@ -1,19 +0,0 @@ -lua << EOF -require("bufferline").setup{} -EOF - -nnoremap :BufferLineCyclePrev -nnoremap :BufferLineCycleNext - -nnoremap 1 BufferLineGoToBuffer 1 -nnoremap 2 BufferLineGoToBuffer 2 -nnoremap 3 BufferLineGoToBuffer 3 -nnoremap 4 BufferLineGoToBuffer 4 -nnoremap 5 BufferLineGoToBuffer 5 -nnoremap 6 BufferLineGoToBuffer 6 -nnoremap 7 BufferLineGoToBuffer 7 -nnoremap 8 BufferLineGoToBuffer 8 -nnoremap 9 BufferLineGoToBuffer 9 - -" Close tab -nnoremap e :bd diff --git a/config/nvim/terminal.vim b/config/nvim/terminal.vim deleted file mode 100644 index 574f4b4..0000000 --- a/config/nvim/terminal.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Use Escape to go to normal mode -tnoremap diff --git a/config/nvim/theme.vim b/config/nvim/theme.vim deleted file mode 100644 index 1e887b0..0000000 --- a/config/nvim/theme.vim +++ /dev/null @@ -1,7 +0,0 @@ -" Colorscheme -let ayucolor = 'mirage' -colorscheme ayu - -" Airline -let g:airline#extensions#tabline#enabled = 1 -let g:airline_theme = 'ayu_mirage'