diff --git a/alacritty.yml b/alacritty.yml index bc7eb224d80cd09cf3054e43985fb374b247e18f..cfb09145eab37c96676fe0b9707c8dbc531046c4 100644 --- a/alacritty.yml +++ b/alacritty.yml @@ -7,7 +7,7 @@ columns: 130 lines: 60 font: - size: 16 + size: 18 normal: family: Berkeley Mono bold: diff --git a/shenanigans.sh b/shenanigans.sh index e7977e9fc8196e26180debeb043981ce338e8485..f402c516de678e8bb6ef40e4f5af474568f8ecbd 100755 --- a/shenanigans.sh +++ b/shenanigans.sh @@ -53,6 +53,7 @@ # Zig paths. export PATH=$HOME/.local/bin/zls-x86_64-linux-0.13.0:$PATH # export PATH=$HOME/.local/bin/zig-linux-x86_64-0.13.0:$PATH export PATH=$HOME/.local/bin/zig-linux-x86_64-0.14.0-dev.1587+feaee2ba1:$PATH +export PATH=$HOME/.local/bin/nim-2.0.8/bin:$PATH # FZF settings. diff --git a/vimrc b/vimrc index a498b84e6fb133cc2ef03a70651fccc350ad3e3b..681244ed94ad0c651aa0bcab6fc64cc99590d4ee 100644 --- a/vimrc +++ b/vimrc @@ -1,44 +1,32 @@ -set nocompatible -set number relativenumber autoindent -set ignorecase smartcase incsearch -set hidden nowrap nobackup noswapfile autoread -set wildmenu wildmode=list:longest,full laststatus=2 +colorscheme sorbet +set number relativenumber autoindent signcolumn=yes +set hidden nowrap nobackup noswapfile autoread updatetime=300 set encoding=utf8 spelllang=en_us set backspace=2 scrolloff=4 set shiftwidth=4 tabstop=4 -set path+=** gp=grep\ -irn -filetype plugin indent on -syntax enable +" https://github.com/junegunn/vim-plug +call plug#begin() +Plug 'tpope/vim-sensible' +Plug 'tpope/vim-commentary' +Plug 'tpope/vim-fugitive' +Plug 'jiangmiao/auto-pairs' +Plug 'junegunn/fzf' +Plug 'junegunn/fzf.vim' +Plug 'neoclide/coc.nvim', {'branch': 'release', 'do': 'npm install'} +call plug#end() nnoremap :bnext nnoremap :bprevious -nnoremap :buffers:buffer nnoremap :copen - -" Personal tabs/spaces settings. -autocmd Filetype make,go,sh setlocal noexpandtab tabstop=4 shiftwidth=4 -autocmd Filetype c,cpp,zig setlocal expandtab tabstop=4 shiftwidth=4 -autocmd Filetype lua,nix,html,xml,javascript,css setlocal expandtab tabstop=2 shiftwidth=2 - -" Code commenting - https://stackoverflow.com/a/1676672. -augroup CodeCommenting - autocmd! - autocmd FileType c,cpp,go,zig,javascript let b:comment_leader = '// ' - autocmd FileType sh,ruby,python let b:comment_leader = '# ' - autocmd FileType conf,fstab let b:comment_leader = '# ' - autocmd FileType lua,sql let b:comment_leader = '-- ' - autocmd FileType vim let b:comment_leader = '" ' -augroup END -noremap cc :silent s/^/=escape(b:comment_leader,'\/')/:nohlsearch -noremap cu :silent s/^\(\s*\)\V=escape(b:comment_leader,'\/')//e:nohlsearch +nnoremap :GFiles +nnoremap :Buffers +nnoremap :Rg -" FZF - fuzzy finder integration. -function! FZF() - let t=tempname() - silent execute '!fzf --preview=''cat {}'' --multi|awk ''{print $1":1:0"}'' > '.fnameescape(t) - execute 'cfile '.t|redraw! - call delete(t) -endfunction -nnoremap :call FZF() +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references)