Gabe/dotfiles
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

started migrating neovim to init.lua.

Browse source 
refs #3
This commit is contained in:
Gabe Venberg 2021-09-06 23:07:40 -05:00
parent 8d4aa86992
commit d8d5296ad2
5 changed files with 131 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

9
neovim/.config/nvim/foldtext.vimrc Normal file
View file

@ -0,0 +1,9 @@
"TODO: cleanup this function!
function! Minimal_foldtext()
let lines_count = v:foldend - v:foldstart + 1
let lines_count_text = '+' . v:folddashes . '| ' . printf("%10S" , lines_count) . ' lines |'
let line_level_text = '| ' . printf("%8S" , 'level ' . v:foldlevel) . ' |'
let fold_text_end = line_level_text . repeat('-',8)
let fold_text_length = strlen(lines_count_text . fold_text_end) + &foldcolumn
return lines_count_text . repeat('-' , winwidth(0) - fold_text_length - 4) . fold_text_end
endfunction

53
neovim/.config/nvim/init.lua Normal file
View file

@ -0,0 +1,53 @@
--set some aliases to make typing this faster.
local cmd=vim.cmd
local opt=vim.opt
local fn=vim.fn
--source any legacy code that I havent ported to lua yet.
cmd([[source ~/.config/nvim/legacy.vimrc]])
--options using vim.opt (aliased, of course.)
opt.lazyredraw=true
opt.autoread=true
opt.swapfile=false
opt.history=500
opt.formatoptions='rojq'
--disable hard text wrapping, will only wrap visually.
opt.textwidth=0
opt.wrapmargin=0
opt.wrap=true
opt.linebreak=true
opt.breakindent=true
--add ruler to side of screen.
opt.number=true
--displays cordinates of your cursor in statusbar
opt.ruler=true
--always leave 5 cells between cursor and side of window.
opt.scrolloff=5
opt.sidescrolloff=5
--better command line completion
opt.wildmenu=true
--ignore case in search if search is all lowercase.
opt.ignorecase=true
opt.smartcase=true
--show unfinished commands in statusbar.
opt.showcmd=true
--regex stuff
opt.magic=true
--always have a status line
opt.laststatus=2
--tab stuff
opt.tabstop=4
opt.shiftwidth=4
opt.autoindent=true
--highlight search results as you type.
opt.hlsearch=true
opt.incsearch=true
--foling stuff
cmd([[source ~/.config/nvim/foldtext.vimrc]])
opt.foldmethod='indent'
opt.foldtext='minimal_foldtext()'
opt.fillchars='stl:=,stlnc: ,vert:|,fold:-'
opt.foldcolumn='4'
opt.foldenable=true
opt.foldminlines=2
opt.foldignore=''

154
neovim/.config/nvim/init.vim
View file

@ -1,154 +0,0 @@
"Customized vim/neovim config
"Copyright 2018 Gabe Venberg
"This program is free software: you can redistribute it and/or modify
"it under the terms of the GNU General Public License as published by
"the Free Software Foundation, either version 3 of the License, or
"(at your option) any later version.
"
"This program is distributed in the hope that it will be useful,
"but WITHOUT ANY WARRANTY; without even the implied warranty of
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
"GNU General Public License for more details.
"
"You should have received a copy of the GNU General Public License
"along with this program. If not, see <http://www.gnu.org/licenses/>.
"this sets what sort of folding method to use.
let foldtype="basicindent"
set lazyredraw
set autoread
set history=5000
filetype plugin on
set noswapfile "disables creation of swap files
"useful keybinds
let mapleader = "\\"
"spell checking
"toggle spell checking
noremap <leader>ss :setlocal spell!<CR>
"splitting panels with <leader>| or -
nnoremap <leader>\| :vs<Enter>
nnoremap <leader>\- :sp<Enter>
" shortcuts using leader
" noremap <leader>sn ]s
" noremap <leader>sp [s
" noremap <leader>s? z=
"navigating splits: Control+hjkl will move from split to split
nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l
"command mode keybinds
"w!! writes using sudo
"cnoremap w!! w !sudo tee % >/dev/null
"user interface stuff
"disables the autocommenting stuff.
set formatoptions-=o
set formatoptions-=r
set formatoptions-=c
"disable text wrapping via carriage returns, should only wrap visually
set textwidth=0
set wrapmargin=0
set wrap
set linebreak
set breakindent
"adds a ruler to the side of the screen
set number
"displays the coordinates of your cursour in the statusbar
set ruler
"scrollofff sets the number of lines from the top or bottom of the screen before vim will scroll. sidescroll off does the same thing for the sides of the window
set scrolloff=5
set sidescrolloff=5
"better command line completion
set wildmenu
"ignore cases in search unless you have a capital letter in the search
set ignorecase
set smartcase
"this allows putting the cursor just after the last character of the line.
"set virtualedit=onemore
"show unfinished commands on the RIGHT side of the statusbar. yes, it is working.
set showcmd
"make regex a bit easier to type
set magic
set hidden
"always display status line
set laststatus=2
"keycodes time out fast, mappings have a bit longer
set timeout timeoutlen=1000 ttimeout ttimeoutlen=100
"make it so the session feature wont overwrite our vimrc if the vimrc has newer bindings than this session.
set sessionoptions-=options
"tab stuff
set tabstop=4
set shiftwidth=4
set autoindent
"highlighting/colour stuff
"sets the colorscheme. to get a list of the available colors, do :colorscheme <Space> <C-d>
colorscheme ron
syntax enable
"highlight search results
set hlsearch
"search as you type
set incsearch
"<leader> L clears the search highlighting
noremap <leader>l :nohls<CR>
"neovim stuff
if has('nvim')
set guicursor=
endif
"folding stuff TODO: implement other folding methods.
"give a bit of margin space for fold number
set foldcolumn=4
set foldenable
"set the minimum number of screen lines for a fold to be closable.
set foldminlines=3
"spacebar opens or closes a fold in normal mode
noremap <Space> za
"indent folding: really basic fold method. eventually I may make some custom folds, but with the foldtext fixed a bit, this shouldn't annoy me too much.
if foldtype ==# "basicindent"
"make vim fold automatically based on indentation.
set foldmethod=indent
"make sure that comment are counted in indent folding!
set foldignore=
set fillchars="fold:-"
"set the fold text for this method, in most cases, the line just above our fold is what we want, so we wont put any text into it. just level and linecount.
function! Minimal_foldtext()
let lines_count = v:foldend - v:foldstart + 1
let lines_count_text = '+' . v:folddashes . '| ' . printf("%10S" , lines_count) . ' lines |'
let line_level_text = '| ' . printf("%8S" , 'level ' . v:foldlevel) . ' |'
let fold_text_end = line_level_text . repeat('-',8)
let fold_text_length = strlen(lines_count_text . fold_text_end) + &foldcolumn
return lines_count_text . repeat('-' , winwidth(0) - fold_text_length - 4) . fold_text_end
endfunction
set foldtext=Minimal_foldtext()
endif

61
neovim/.config/nvim/legacy.vimrc Normal file
View file

@ -0,0 +1,61 @@
"Customized vim/neovim config
"Copyright 2018 Gabe Venberg
"This program is free software: you can redistribute it and/or modify
"it under the terms of the GNU General Public License as published by
"the Free Software Foundation, either version 3 of the License, or
"(at your option) any later version.
"
"This program is distributed in the hope that it will be useful,
"but WITHOUT ANY WARRANTY; without even the implied warranty of
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
"GNU General Public License for more details.
"
"You should have received a copy of the GNU General Public License
"along with this program. If not, see <http://www.gnu.org/licenses/>.
filetype plugin on
"useful keybinds
let mapleader = "\\"
"spell checking
"toggle spell checking
noremap <leader>ss :setlocal spell!<CR>
"splitting panels with <leader>| or -
nnoremap <leader>\| :vs<Enter>
nnoremap <leader>\- :sp<Enter>
" shortcuts using leader
" noremap <leader>sn ]s
" noremap <leader>sp [s
" noremap <leader>s? z=
"navigating splits: Control+hjkl will move from split to split
nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l
"command mode keybinds
"w!! writes using sudo
"cnoremap w!! w !sudo tee % >/dev/null
"highlighting/colour stuff
"sets the colorscheme. to get a list of the available colors, do :colorscheme <Space> <C-d>
colorscheme ron
syntax enable
"<leader> L clears the search highlighting
noremap <leader>l :nohls<CR>
"neovim stuff
" if has('nvim')
" set guicursor=
" endif
"folding stuff TODO: implement other folding methods.
"spacebar opens or closes a fold in normal mode
noremap <Space> za