vim and nvim config refactor / update
This commit is contained in:
Von Random
parent
a5827a87a2
commit
aeb129a621
3 changed files with 81 additions and 121 deletions
|
|
@ -1,36 +1,40 @@
|
|||
require('paq') {
|
||||
'savq/paq-nvim',
|
||||
local ensure_packer = function()
|
||||
local install_path = vim.fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
|
||||
if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
|
||||
vim.fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
|
||||
vim.cmd [[packadd packer.nvim]]
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
'mhinz/vim-signify',
|
||||
'tpope/vim-commentary',
|
||||
'tpope/vim-fugitive',
|
||||
'tpope/vim-rsi',
|
||||
'tpope/vim-vinegar',
|
||||
'hoob3rt/lualine.nvim',
|
||||
local packer_bootstrap = ensure_packer()
|
||||
|
||||
require('packer').startup(function(use)
|
||||
use 'wbthomason/packer.nvim'
|
||||
use 'lifepillar/vim-gruvbox8'
|
||||
|
||||
use 'mhinz/vim-signify'
|
||||
use 'tpope/vim-fugitive'
|
||||
use 'tpope/vim-rsi'
|
||||
use 'tpope/vim-vinegar'
|
||||
use 'hoob3rt/lualine.nvim'
|
||||
use {
|
||||
'w0rp/ale',
|
||||
|
||||
'lifepillar/vim-gruvbox8',
|
||||
'lifepillar/vim-solarized8',
|
||||
'NLKNguyen/papercolor-theme'
|
||||
}
|
||||
|
||||
require('lualine').setup{
|
||||
options = {
|
||||
icons_enabled = false,
|
||||
section_separators = { left = '', right = ''},
|
||||
component_separators = { left = '', right = ''}
|
||||
ft = { 'sh', 'zsh', 'lua', 'python' },
|
||||
cmd = 'ALEEnable'
|
||||
}
|
||||
}
|
||||
end)
|
||||
|
||||
vim.g.vimwiki_list = {{path='$HOME/vimwiki/', syntax='markdown', ext='.md'}}
|
||||
vim.g.PaperColor_Theme_Options = {
|
||||
theme = {
|
||||
["default.dark"] = { allow_bold = 1, allow_italic = 1 },
|
||||
["default.light"] = { allow_bold = 1, allow_italic = 1 }
|
||||
}
|
||||
}
|
||||
if packer_bootstrap then
|
||||
require('packer').sync()
|
||||
return
|
||||
end
|
||||
|
||||
require('lualine').setup { options = { icons_enabled = false } }
|
||||
vim.o.bg = 'dark'
|
||||
vim.o.termguicolors = true
|
||||
vim.g.gruvbox_transp_bg = 1
|
||||
vim.g.gruvbox_plugin_hi_groups = 1
|
||||
vim.g.gruvbox_filetype_hi_groups = 1
|
||||
vim.cmd('colorscheme gruvbox8')
|
||||
|
|
|
|||
98
vimplugrc
98
vimplugrc
|
|
@ -1,49 +1,11 @@
|
|||
" support my own way of using plugins in vim / bash
|
||||
vim9script
|
||||
autocmd BufRead *vimplugrc set ft=vim
|
||||
|
||||
let theme = 'gruvbox8'
|
||||
let themebg = 'dark'
|
||||
let lightline_theme = printf(theme)
|
||||
|
||||
function EnableTGC()
|
||||
let &t_8f = "\u1b[38;2;%lu;%lu;%lum"
|
||||
let &t_8b = "\u1b[48;2;%lu;%lu;%lum"
|
||||
let &tgc = 1
|
||||
endfunction
|
||||
|
||||
if theme == 'PaperColor'
|
||||
let g:PaperColor_Theme_Options = {'theme': {
|
||||
\ 'default.dark': {'allow_bold': 1, 'allow_italic': 1},
|
||||
\ 'default.light': {'allow_bold': 1, 'allow_italic': 1}
|
||||
\ }}
|
||||
endif
|
||||
|
||||
if theme == 'gruvbox8'
|
||||
call EnableTGC()
|
||||
let g:gruvbox_transp_bg = 1
|
||||
let g:gruvbox_plugin_hi_groups = 1
|
||||
let g:gruvbox_filetype_hi_groups = 1
|
||||
endif
|
||||
|
||||
if theme == 'solarized8'
|
||||
let lightline_theme = 'solarized'
|
||||
|
||||
let g:solarized_use16 = 1
|
||||
let g:solarized_italics = 1
|
||||
let g:solarized_extra_hi_groups = 1
|
||||
let g:solarized_termtrans = 1
|
||||
let g:solarized_termcolors = 16
|
||||
endif
|
||||
|
||||
" enable plugins
|
||||
execute 'source' fnameescape(plug)
|
||||
silent!call plug#begin(plugdir)
|
||||
|
||||
" plugin manager for self updates
|
||||
execute 'source' fnameescape(g:plug)
|
||||
plug#begin(g:plugdir)
|
||||
Plug 'junegunn/vim-plug'
|
||||
Plug 'lifepillar/vim-gruvbox8'
|
||||
|
||||
" general plugins
|
||||
"Plug 'sheerun/vim-polyglot'
|
||||
Plug 'hashivim/vim-terraform'
|
||||
Plug 'itchyny/lightline.vim'
|
||||
Plug 'junegunn/fzf'
|
||||
|
|
@ -55,49 +17,43 @@ Plug 'tpope/vim-fugitive'
|
|||
Plug 'tpope/vim-rsi'
|
||||
Plug 'tpope/vim-vinegar'
|
||||
Plug 'w0rp/ale', {'for': ['sh']}
|
||||
Plug 'vimwiki/vimwiki', {'on': 'VimwikiIndex'}
|
||||
plug#end()
|
||||
|
||||
" themes
|
||||
Plug 'lifepillar/vim-gruvbox8'
|
||||
Plug 'lifepillar/vim-solarized8'
|
||||
Plug 'NLKNguyen/papercolor-theme'
|
||||
|
||||
call plug#end()
|
||||
|
||||
" easy-align
|
||||
# easy-align
|
||||
xmap <Leader>a <Plug>(EasyAlign)
|
||||
nmap <Leader>a <Plug>(EasyAlign)
|
||||
|
||||
" fzf
|
||||
# fzf
|
||||
nmap <Leader>ff :Files<CR>
|
||||
nmap <Leader>fg :GFiles<CR>
|
||||
nmap <Leader>fb :Buffers<CR>
|
||||
nmap <Leader>fl :Lines<CR>
|
||||
nmap <Leader>ft :Filetypes<CR>
|
||||
|
||||
" vimwiki
|
||||
let g:vimwiki_list = [{'path': '$HOME/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
|
||||
# lightline
|
||||
g:lightline = {
|
||||
colorscheme: 'gruvbox8',
|
||||
separator: { left: "\ue0b0", right: "\ue0b2"},
|
||||
subseparator: { left: "\ue0b1", right: "\ue0b3"}
|
||||
}
|
||||
|
||||
" lightline
|
||||
let g:lightline = {
|
||||
\ 'separator': {'left': "\ue0b0", 'right': "\ue0b2"},
|
||||
\ 'subseparator': {'left': "\ue0b1", 'right': "\ue0b3"}
|
||||
\ }
|
||||
let g:lightline['colorscheme'] = printf(lightline_theme)
|
||||
|
||||
if $TERM !~ '^linux'
|
||||
if $TERM == 'xterm-256color'
|
||||
if $TERM == 'xterm-256color'
|
||||
set term=xterm-direct
|
||||
endif
|
||||
if has('gui_running')
|
||||
set guifont=Cascadia\ Code\ PL:h16
|
||||
endif
|
||||
|
||||
g:gruvbox_transp_bg = 1
|
||||
g:gruvbox_plugin_hi_groups = 1
|
||||
g:gruvbox_filetype_hi_groups = 1
|
||||
&t_8f = "\u1b[38;2;%lu;%lu;%lum"
|
||||
&t_8b = "\u1b[48;2;%lu;%lu;%lum"
|
||||
&tgc = 1
|
||||
&bg = 'dark'
|
||||
colorscheme gruvbox8
|
||||
|
||||
if has('gui_running')
|
||||
set guifont=JetBrains\ Mono:h14
|
||||
set guicursor=a:blinkon0,a:block,i:ver1-Cursor/lCursor,r:hor1-Cursor/lCursor
|
||||
set guiheadroom=0 guioptions=aei mouse=a
|
||||
|
||||
map <S-Insert> <MiddleMouse>
|
||||
map! <S-Insert> <MiddleMouse>
|
||||
endif
|
||||
|
||||
let &bg = printf(themebg)
|
||||
execute printf('colorscheme %s', theme)
|
||||
endif
|
||||
|
|
|
|||
28
vimrc
28
vimrc
|
|
@ -1,3 +1,4 @@
|
|||
vim9script
|
||||
set nobackup nomodeline backspace=indent,eol,start foldmethod=marker cursorline
|
||||
set list listchars=tab:-->,nbsp:x,trail:*
|
||||
set hlsearch incsearch ignorecase smartcase
|
||||
|
|
@ -6,32 +7,31 @@ set tabstop=3 softtabstop=4 shiftwidth=4 smarttab expandtab autoindent
|
|||
set wildmenu showcmd ruler laststatus=2 mouse= t_ut= guicursor= t_Co=256
|
||||
set belloff=all colorcolumn=80 formatoptions+=j relativenumber breakindent
|
||||
set keymap=russian-jcukenwintype iminsert=0 imsearch=0
|
||||
let &statusline="[%F] %R%H%W%M %=[%{&fenc}/%{&ff}] %y [%4l/%L:%3v]"
|
||||
let g:sh_indent_case_labels = 1
|
||||
&statusline = "[%F] %R%H%W%M %=[%{&fenc}/%{&ff}] %y [%4l/%L:%3v]"
|
||||
g:sh_indent_case_labels = 1
|
||||
|
||||
" mappings
|
||||
# mappings
|
||||
map <Space> <NOP>
|
||||
let mapleader="\<Space>"
|
||||
var mapleader = '\<Space>'
|
||||
noremap <F1> <Esc>
|
||||
noremap! <F1> <Esc>
|
||||
nnoremap <Leader>l :setlocal list!<CR>
|
||||
nnoremap <Leader>c :setlocal cursorline!<CR>
|
||||
nnoremap <Leader>w :setlocal wrap!<CR>
|
||||
noremap <Leader>/ :noh<CR>
|
||||
noremap <Leader>y "+y
|
||||
noremap <Leader>d "+d
|
||||
noremap <Leader>p "+p
|
||||
noremap <Leader>P "+P
|
||||
noremap q <NOP>
|
||||
noremap! <F1> <Esc>
|
||||
noremap! <C-@> <C-^>
|
||||
noremap! <C-Space> <C-^>
|
||||
nnoremap <Leader>l :setlocal list!<CR>
|
||||
nnoremap <Leader>c :setlocal cursorline!<CR>
|
||||
nnoremap <Leader>w :setlocal wrap!<CR>
|
||||
|
||||
" plugins
|
||||
let plugrc = expand('$HOME/.vimplugrc')
|
||||
let plugdir = expand('$HOME/.vim/plugged')
|
||||
let plug = plugdir . '/vim-plug/plug.vim'
|
||||
if filereadable(plugrc) && filereadable(plug) && v:version >= 703
|
||||
execute 'source' fnameescape(plugrc)
|
||||
g:plugrc = expand('$HOME/.vimplugrc')
|
||||
g:plugdir = expand('$HOME/.vim/plugged')
|
||||
g:plug = g:plugdir .. '/vim-plug/plug.vim'
|
||||
if filereadable(g:plugrc) && filereadable(g:plug) && v:version >= 703
|
||||
execute 'source' fnameescape(g:plugrc)
|
||||
endif
|
||||
|
||||
syntax on
|
||||
|
|
|
|||
Loading…
Reference in a new issue