From 9c62b70fb8499f785e2f11a3e3c2e0dba4438d74 Mon Sep 17 00:00:00 2001 From: cassiobotaro Date: Sat, 7 Jan 2023 21:19:21 -0300 Subject: [PATCH] Split vim and neovim template. Add new template for nvim-lua. --- generate/generate.go | 13 +- generate/vim_template/nvimlua.lua | 20 ++ generate/vim_template/nvimrc | 476 ++++++++++++++++++++++++++++++ generate/vim_template/vimrc | 13 +- 4 files changed, 510 insertions(+), 12 deletions(-) create mode 100644 generate/vim_template/nvimlua.lua create mode 100644 generate/vim_template/nvimrc diff --git a/generate/generate.go b/generate/generate.go index a5e92627e..b1bed9e2a 100644 --- a/generate/generate.go +++ b/generate/generate.go @@ -14,6 +14,7 @@ type Config struct { Rc string LocalRc string LocalBundle string + Template string } // Theme ... @@ -39,6 +40,12 @@ type Object struct { //go:embed vim_template/vimrc var vimrc string +//go:embed vim_template/nvimrc +var nvimrc string + +//go:embed vim_template/nvimlua.lua +var nvimlua string + //go:embed vim_template var vimTemplate embed.FS @@ -95,11 +102,15 @@ func Generate(obj *Object) (buffer string) { config.Rc = filepath.Join(config.BaseDir, "init.vim") config.LocalRc = filepath.Join(config.BaseDir, "local_init.vim") config.LocalBundle = filepath.Join(config.BaseDir, "local_bundles.vim") + config.Template = nvimrc + case "neovim-lua", "nvim-lua": + config.Template = nvimlua default: config.BaseDir = "~/." + obj.Editor config.Rc = config.BaseDir + "rc" config.LocalRc = config.Rc + ".local" config.LocalBundle = config.Rc + ".local.bundles" + config.Template = vimrc } obj.Config = &config @@ -121,7 +132,7 @@ func Generate(obj *Object) (buffer string) { obj.BufferBundle = mBundle var vimBuffer bytes.Buffer - t := template.Must(template.New("vimrc").Parse(vimrc)) + t := template.Must(template.New("vimrc").Parse(config.Template)) t.Execute(&vimBuffer, obj) buffer = vimBuffer.String() diff --git a/generate/vim_template/nvimlua.lua b/generate/vim_template/nvimlua.lua new file mode 100644 index 000000000..26e93ab63 --- /dev/null +++ b/generate/vim_template/nvimlua.lua @@ -0,0 +1,20 @@ +-- lua config +vim.g.vim_bootstrap_editor = '{{.Editor}}' + +-- Install packer +local install_path = vim.fn.stdpath 'data' .. '/site/pack/packer/start/packer.nvim' +local is_bootstrap = false +if vim.fn.empty(vim.fn.glob(install_path)) > 0 then + is_bootstrap = true + vim.fn.execute('!git clone https://github.com/wbthomason/packer.nvim ' .. install_path) + vim.cmd.packadd 'packer.nvim' +end + +require('packer').startup(function(use) + -- Package manager + use 'wbthomason/packer.nvim' + + if is_bootstrap then + require('packer').sync() + end +end) diff --git a/generate/vim_template/nvimrc b/generate/vim_template/nvimrc new file mode 100644 index 000000000..91ceb111e --- /dev/null +++ b/generate/vim_template/nvimrc @@ -0,0 +1,476 @@ +" vim-bootstrap {{.Version}} + +"***************************************************************************** +"" Vim-Plug core +"***************************************************************************** +let vimplug_exists=expand('{{.Config.BaseDir}}/autoload/plug.vim') +if has('win32')&&!has('win64') + let curl_exists=expand('C:\Windows\Sysnative\curl.exe') +else + let curl_exists=expand('curl') +endif + +let g:vim_bootstrap_langs = "{{ range $key, $value := .Language}}{{if $key}},{{end}}{{$value}}{{end}}" +let g:vim_bootstrap_editor = "{{.Editor}}" " nvim or vim +let g:vim_bootstrap_theme = "{{.Theme}}" +let g:vim_bootstrap_frams = "{{ range $key, $value := .Frameworks}}{{if $key}},{{end}}{{$value}}{{end}}" + +if !filereadable(vimplug_exists) + if !executable(curl_exists) + echoerr "You have to install curl or first install vim-plug yourself!" + execute "q!" + endif + echo "Installing Vim-Plug..." + echo "" + silent exec "!"curl_exists" -fLo " . shellescape(vimplug_exists) . " --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" + let g:not_finish_vimplug = "yes" + + autocmd VimEnter * PlugInstall +endif + +" Required: +call plug#begin(expand('{{.Config.BaseDir}}/plugged')) + +"***************************************************************************** +"" Plug install packages +"***************************************************************************** +Plug 'scrooloose/nerdtree' +Plug 'jistr/vim-nerdtree-tabs' +Plug 'tpope/vim-commentary' +Plug 'tpope/vim-fugitive' +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' +Plug 'airblade/vim-gitgutter' +Plug 'vim-scripts/grep.vim' +Plug 'vim-scripts/CSApprox' +Plug 'Raimondi/delimitMate' +Plug 'majutsushi/tagbar' +Plug 'dense-analysis/ale' +Plug 'Yggdroot/indentLine' +Plug 'editor-bootstrap/vim-bootstrap-updater' +Plug 'tpope/vim-rhubarb' " required by fugitive to :Gbrowse +{{.BufferTheme.Bundle}} + +if isdirectory('/usr/local/opt/fzf') + Plug '/usr/local/opt/fzf' | Plug 'junegunn/fzf.vim' +else + Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } + Plug 'junegunn/fzf.vim' +endif +let g:make = 'gmake' +if exists('make') + let g:make = 'make' +endif +Plug 'Shougo/vimproc.vim', {'do': g:make} + +"" Vim-Session +Plug 'xolox/vim-misc' +Plug 'xolox/vim-session' + +"" Snippets +Plug 'SirVer/ultisnips' +Plug 'honza/vim-snippets' + +"***************************************************************************** +"" Custom bundles +"***************************************************************************** +{{ range $key, $value := .BufferBundle}} +" {{ $key }} +{{$value}} +{{end}} +"***************************************************************************** +"***************************************************************************** + +"" Include user's extra bundle +if filereadable(expand("{{.Config.LocalBundle}}")) + source {{.Config.LocalBundle}} +endif + +call plug#end() + +" Required: +filetype plugin indent on + + +"***************************************************************************** +"" Basic Setup +"*****************************************************************************" +"" Encoding +set encoding=utf-8 +set fileencoding=utf-8 +set fileencodings=utf-8 + +"" Fix backspace indent +set backspace=indent,eol,start + +"" Tabs. May be overridden by autocmd rules +set tabstop=4 +set softtabstop=0 +set shiftwidth=4 +set expandtab + +"" Map leader to , +let mapleader=',' + +"" Enable hidden buffers +set hidden + +"" Searching +set hlsearch +set incsearch +set ignorecase +set smartcase + +set fileformats=unix,dos,mac + +if exists('$SHELL') + set shell=$SHELL +else + set shell=/bin/sh +endif + +" session management +let g:session_directory = "{{.Config.BaseDir}}/session" +let g:session_autoload = "no" +let g:session_autosave = "no" +let g:session_command_aliases = 1 + +"***************************************************************************** +"" Visual Settings +"***************************************************************************** +syntax on +set ruler +set number + +let no_buffers_menu=1 +{{.BufferTheme.Coloscheme}} + +" Better command line completion +set wildmenu + +" mouse support +set mouse=a + +set mousemodel=popup +set t_Co=256 +set guioptions=egmrti +set gfn=Monospace\ 10 + +if has("gui_running") + if has("gui_mac") || has("gui_macvim") + set guifont=Menlo:h12 + set transparency=7 + endif +else + let g:CSApprox_loaded = 1 + + " IndentLine + let g:indentLine_enabled = 1 + let g:indentLine_concealcursor = '' + let g:indentLine_char = '┆' + let g:indentLine_faster = 1 + +endif + +"" Disable the blinking cursor. +set gcr=a:blinkon0 +au TermEnter * setlocal scrolloff=0 +au TermLeave * setlocal scrolloff=3 + +"" Status bar +set laststatus=2 + +"" Use modeline overrides +set modeline +set modelines=10 + +set title +set titleold="Terminal" +set titlestring=%F + +set statusline=%F%m%r%h%w%=(%{&ff}/%Y)\ (line\ %l\/%L,\ col\ %c)\ + +" Search mappings: These will make it so that going to the next one in a +" search will center on the line it's found in. +nnoremap n nzzzv +nnoremap N Nzzzv + +if exists("*fugitive#statusline") + set statusline+=%{fugitive#statusline()} +endif + +" vim-airline +let g:airline_theme = 'powerlineish' +let g:airline#extensions#branch#enabled = 1 +let g:airline#extensions#ale#enabled = 1 +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tagbar#enabled = 1 +let g:airline_skip_empty_sections = 1 + +"***************************************************************************** +"" Abbreviations +"***************************************************************************** +"" no one is really happy until you have this shortcuts +cnoreabbrev W! w! +cnoreabbrev Q! q! +cnoreabbrev Qall! qall! +cnoreabbrev Wq wq +cnoreabbrev Wa wa +cnoreabbrev wQ wq +cnoreabbrev WQ wq +cnoreabbrev W w +cnoreabbrev Q q +cnoreabbrev Qall qall + +"" NERDTree configuration +let g:NERDTreeChDirMode=2 +let g:NERDTreeIgnore=['node_modules','\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__'] +let g:NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$'] +let g:NERDTreeShowBookmarks=1 +let g:nerdtree_tabs_focus_on_files=1 +let g:NERDTreeMapOpenInTabSilent = '' +let g:NERDTreeWinSize = 50 +set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite,*node_modules/ +nnoremap :NERDTreeFind +nnoremap :NERDTreeToggle + +" grep.vim +nnoremap f :Rgrep +let Grep_Default_Options = '-IR' +let Grep_Skip_Files = '*.log *.db' +let Grep_Skip_Dirs = '.git node_modules' + +" terminal emulation +nnoremap sh :terminal + + +"***************************************************************************** +"" Commands +"***************************************************************************** +" remove trailing whitespaces +command! FixWhitespace :%s/\s\+$//e + +"***************************************************************************** +"" Functions +"***************************************************************************** +if !exists('*s:setupWrapping') + function s:setupWrapping() + set wrap + set wm=2 + set textwidth=79 + endfunction +endif + +"***************************************************************************** +"" Autocmd Rules +"***************************************************************************** +"" The PC is fast enough, do syntax highlight syncing from start unless 200 lines +augroup vimrc-sync-fromstart + autocmd! + autocmd BufEnter * :syntax sync maxlines=200 +augroup END + +"" Remember cursor position +augroup vimrc-remember-cursor-position + autocmd! + autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif +augroup END + +"" txt +augroup vimrc-wrapping + autocmd! + autocmd BufRead,BufNewFile *.txt call s:setupWrapping() +augroup END + +"" make/cmake +augroup vimrc-make-cmake + autocmd! + autocmd FileType make setlocal noexpandtab + autocmd BufNewFile,BufRead CMakeLists.txt setlocal filetype=cmake +augroup END + +set autoread + +"***************************************************************************** +"" Mappings +"***************************************************************************** + +"" Split +noremap h :split +noremap v :vsplit + +"" Git +noremap ga :Gwrite +noremap gc :Git commit --verbose +noremap gsh :Git push +noremap gll :Git pull +noremap gs :Git +noremap gb :Git blame +noremap gd :Gvdiffsplit +noremap gr :GRemove + +" session management +nnoremap so :OpenSession +nnoremap ss :SaveSession +nnoremap sd :DeleteSession +nnoremap sc :CloseSession + +"" Tabs +nnoremap gt +nnoremap gT +nnoremap :tabnew + +"" Set working directory +nnoremap . :lcd %:p:h + +"" Opens an edit command with the path of the currently edited file filled in +noremap e :e =expand("%:p:h") . "/" + +"" Opens a tab edit command with the path of the currently edited file filled +noremap te :tabe =expand("%:p:h") . "/" + +"" fzf.vim +set wildmode=list:longest,list:full +set wildignore+=*.o,*.obj,.git,*.rbc,*.pyc,__pycache__ +let $FZF_DEFAULT_COMMAND = "find * -path '*/\.*' -prune -o -path 'node_modules/**' -prune -o -path 'target/**' -prune -o -path 'dist/**' -prune -o -type f -print -o -type l -print 2> /dev/null" + +" The Silver Searcher +if executable('ag') + let $FZF_DEFAULT_COMMAND = 'ag --hidden --ignore .git -g ""' + set grepprg=ag\ --nogroup\ --nocolor +endif + +" ripgrep +if executable('rg') + let $FZF_DEFAULT_COMMAND = 'rg --files --hidden --follow --glob "!.git/*"' + set grepprg=rg\ --vimgrep + command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --glob "!.git/*" --color "always" '.shellescape().'| tr -d "\017"', 1, 0) +endif + +cnoremap =expand("%:p:h") . "/" +nnoremap b :Buffers +nnoremap e :FZF -m +"Recovery commands from history through FZF +nmap y :History: + +" snippets +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" +let g:UltiSnipsEditSplit="vertical" + +" ale +let g:ale_linters = {} + +" Tagbar +nmap :TagbarToggle +let g:tagbar_autofocus = 1 + +" Disable visualbell +set noerrorbells visualbell t_vb= +if has('autocmd') + autocmd GUIEnter * set visualbell t_vb= +endif + +"" Copy/Paste/Cut +if has('unnamedplus') + set clipboard=unnamed,unnamedplus +endif + +noremap YY "+y +noremap p "+gP +noremap XX "+x + +if has('macunix') + " pbcopy for OSX copy/paste + vmap :!pbcopy + vmap :w !pbcopy +endif + +"" Buffer nav +noremap z :bp +noremap q :bp +noremap x :bn +noremap w :bn + +"" Close buffer +noremap c :bd + +"" Clean search (highlight) +nnoremap :noh + +"" Switching windows +noremap j +noremap k +noremap l +noremap h + +"" Vmap for maintain Visual Mode after shifting > and < +vmap < >gv + +"" Move visual block +vnoremap J :m '>+1gv=gv +vnoremap K :m '<-2gv=gv + +"" Open current line on GitHub +nnoremap o :.Gbrowse + +"***************************************************************************** +"" Custom configs +"***************************************************************************** +{{ range $key, $value := .BufferLang}} +" {{ $key }} +{{$value}} +{{end}} +{{ range $key, $value := .BufferFramework}} +" {{ $key }} +{{$value}} +{{end}} +"***************************************************************************** +"***************************************************************************** + +"" Include user's local vim config +if filereadable(expand("{{.Config.LocalRc}}")) + source {{.Config.LocalRc}} +endif + +"***************************************************************************** +"" Convenience variables +"***************************************************************************** + +" vim-airline +if !exists('g:airline_symbols') + let g:airline_symbols = {} +endif + +if !exists('g:airline_powerline_fonts') + let g:airline#extensions#tabline#left_sep = ' ' + let g:airline#extensions#tabline#left_alt_sep = '|' + let g:airline_left_sep = '▶' + let g:airline_left_alt_sep = '»' + let g:airline_right_sep = '◀' + let g:airline_right_alt_sep = '«' + let g:airline#extensions#branch#prefix = '⤴' "➔, ➥, ⎇ + let g:airline#extensions#readonly#symbol = '⊘' + let g:airline#extensions#linecolumn#prefix = '¶' + let g:airline#extensions#paste#symbol = 'ρ' + let g:airline_symbols.linenr = '␊' + let g:airline_symbols.branch = '⎇' + let g:airline_symbols.paste = 'ρ' + let g:airline_symbols.paste = 'Þ' + let g:airline_symbols.paste = '∥' + let g:airline_symbols.whitespace = 'Ξ' +else + let g:airline#extensions#tabline#left_sep = '' + let g:airline#extensions#tabline#left_alt_sep = '' + + " powerline symbols + let g:airline_left_sep = '' + let g:airline_left_alt_sep = '' + let g:airline_right_sep = '' + let g:airline_right_alt_sep = '' + let g:airline_symbols.branch = '' + let g:airline_symbols.readonly = '' + let g:airline_symbols.linenr = '' +endif diff --git a/generate/vim_template/vimrc b/generate/vim_template/vimrc index a1a7a6203..818e2c098 100644 --- a/generate/vim_template/vimrc +++ b/generate/vim_template/vimrc @@ -99,7 +99,7 @@ filetype plugin indent on set encoding=utf-8 set fileencoding=utf-8 set fileencodings=utf-8 -{{if ne .Editor "nvim"}}set ttyfast{{end}} +set ttyfast "" Fix backspace indent set backspace=indent,eol,start @@ -146,7 +146,7 @@ set number let no_buffers_menu=1 {{.BufferTheme.Coloscheme}} -" Better command line completion +" Better command line completion set wildmenu " mouse support @@ -171,7 +171,6 @@ else let g:indentLine_char = '┆' let g:indentLine_faster = 1 - {{if ne .Editor "nvim"}} if $COLORTERM == 'gnome-terminal' set term=gnome-256color else @@ -179,23 +178,15 @@ else set term=xterm-256color endif endif - {{end}} endif -{{if ne .Editor "nvim"}} if &term =~ '256color' set t_ut= endif -{{end}} "" Disable the blinking cursor. set gcr=a:blinkon0 -{{if eq .Editor "nvim"}} -au TermEnter * setlocal scrolloff=0 -au TermLeave * setlocal scrolloff=3 -{{else}} set scrolloff=3 -{{end}} "" Status bar set laststatus=2