diff --git a/CHANGELOG.md b/CHANGELOG.md index b4066de..2343747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.7.1] - 2020-06-09 +### Fixed +- Cleaned up vimrc. +- Fixed Amethyst bindings. + ## [0.7.0] - 2020-06-06 ### Added - Replace htop with ytop. You'll have to install ytop. It's been given the alias `top`. @@ -88,7 +93,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Created basic script for proof of concept. -[Unreleased]: https://github.com/adamtabrams/fig/compare/0.7.0...HEAD +[Unreleased]: https://github.com/adamtabrams/fig/compare/0.7.1...HEAD +[0.7.1]: https://github.com/adamtabrams/fig/compare/0.7.0...0.7.1 [0.7.0]: https://github.com/adamtabrams/fig/compare/0.6.1...0.7.0 [0.6.1]: https://github.com/adamtabrams/fig/compare/0.6.0...0.6.1 [0.6.0]: https://github.com/adamtabrams/fig/compare/0.5.0...0.6.0 diff --git a/home/.config/lf/lfrc b/home/.config/lf/lfrc index 3b82b07..e02240d 100644 --- a/home/.config/lf/lfrc +++ b/home/.config/lf/lfrc @@ -10,6 +10,7 @@ set findlen 0 set previewer ~/.config/lf/preview.sh set sortby 'ctime' set reverse +set hiddenfiles ".DS_Store:.git:.gitignore:~/[.ADLMP]*:!~/.config" ### Mappings ### map $lf -remote "send $id cd '$(~/.config/lf/cd-fzf.sh)'" @@ -21,6 +22,3 @@ map x $$f map X !$f map L $lazygit map D :delete - -# custom ignore -set hiddenFiles "**/.DS_Store:**/.git:**/.gitignore:~/[.ADLMP]*:!~/.config" diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim index 656c73a..4daacbe 100644 --- a/home/.config/nvim/init.vim +++ b/home/.config/nvim/init.vim @@ -1,4 +1,4 @@ -"##################### PLUG ######################### +"### Plug ######################################## if ! filereadable(expand('~/.local/share/nvim/site/autoload/plug.vim')) echo "Downloading junegunn/vim-plug to manage plugins..." silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs @@ -17,16 +17,17 @@ Plug 'tpope/vim-fugitive' Plug 'tomtom/tcomment_vim' Plug '/usr/local/opt/fzf' Plug 'junegunn/fzf.vim' -Plug 'dense-analysis/ale' Plug 'yggdroot/indentline' +Plug 'easymotion/vim-easymotion' +Plug 'junegunn/goyo.vim' +Plug 'dense-analysis/ale' Plug 'fatih/vim-go' -Plug 'vimwiki/vimwiki' Plug 'rust-lang/rust.vim' Plug 'racer-rust/vim-racer' -Plug 'easymotion/vim-easymotion' +Plug 'vimwiki/vimwiki' call plug#end() -"##################### PLUGINS ###################### +"### Plugins ##################################### let g:fzf_layout = { 'down': '~70%' } command! -bang -nargs=? -complete=dir Files \ call fzf#vim#files(, fzf#vim#with_preview(), 0) @@ -101,7 +102,7 @@ let g:indentLine_char = '│' let g:racer_insert_paren = 1 let g:racer_experimental_completer = 1 -"##################### SETTINGS ##################### +"### Settings #################################### set fileformats=unix,mac,dos set wildmode=longest,list,full set clipboard+=unnamedplus @@ -121,21 +122,23 @@ set nohlsearch set hidden set background=dark set iskeyword+=- +set nojoinspaces colorscheme solarized syntax enable -"##################### AUTOCMDS ##################### +"### Autocmds #################################### autocmd TermOpen * setlocal nonu nornu autocmd TermOpen * IndentLinesDisable autocmd TermOpen * startinsert autocmd BufWritePre * %s:\s\+$::e -autocmd BufNewFile,BufRead * setlocal formatoptions -=o +autocmd BufNewFile,BufRead * set formatoptions -=o autocmd BufNewFile,BufRead Jenkinsfile setlocal filetype=groovy +autocmd BufNewFile,BufRead *.mom setlocal filetype=groff autocmd FileType yaml,json set tabstop=2 shiftwidth=2 autocmd FileType json IndentLinesDisable autocmd FileType markdown setlocal spell -"################### FUNCTIONS ###################### +"### Functions ################################## function! ResizeMode() let key = nr2char(getchar()) while key != "q" && key != "\" @@ -214,11 +217,11 @@ function! AlignWithMark(...) return "" endfunction -"################### REMAPPINGS ##################### -"--- Hotfix ----------------------------------------- +"### Remappings ################################## +"--- Hotfix -------------------------------------- cnoremap 3636 undo -"--- Should-Be-Defaults ----------------------------- +"--- Should-Be-Defaults -------------------------- cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' edit! nnoremap c "_c nnoremap Y y$ @@ -226,7 +229,7 @@ inoremap p tnoremap tmap -"--- Functions --------------------------------------- +"--- Functions ----------------------------------- nnoremap r t:call ResizeMode() nnoremap R :call ResizeMode() @@ -240,52 +243,56 @@ inoremap =OmniTab() nnoremap gA :call AlignWithMark("i") vnoremap gA :call AlignWithMark("s") -"--- Testing ---------------------------------------- +"--- Testing ------------------------------------- nnoremap gw :w nnoremap gN :tabnext nnoremap gP :tabprevious nnoremap zz nnoremap zz -"--- Autocomplete ----------------------------------- +"--- Autocomplete -------------------------------- inoremap inoremap inoremap "^ block complete (continue completing where left off) -"--- Splits/Buffers --------------------------------- +"--- Splits/Buffers ------------------------------ nnoremap gn :bn nnoremap gp :bp nnoremap gbd :bd nnoremap gbD :bd \| sbn -"--- Coding ----------------------------------------- +"--- Writing ------------------------------------- +cnoremap Essayon Goyo \| ALEDisableBuffer \| setlocal fo+=a tw=81 nospell +cnoremap Essayoff Goyo! \| ALEEnableBuffer \| setlocal fo-=a tw=0 spell + +"--- Coding -------------------------------------- nnoremap goq jq nnoremap gs :%s//g nnoremap gS :%s///g nnoremap gth :set hlsearch! nnoremap gtl :IndentLinesToggle -"--- SURROUND ---------------------------------------- +"--- Surround ------------------------------------ nmap dsf dt(ds( nmap dsm dt[ds[ nmap dsl dt{ds{ nmap dsv dt(easymotion-overwin-w) nmap gF (easymotion-bd-wl) nmap g (easymotion-jumptoanywhere) -"--- ALE LINTING ------------------------------------ +"--- Ale Linting --------------------------------- nnoremap gaa :ALEFirst nnoremap gan :ALENextWrap nnoremap gap :ALEPreviousWrap nnoremap gaf :ALEFix nnoremap gad :ALEDetail -"--- VIM-GO ----------------------------------------- +"--- Vim-Go -------------------------------------- autocmd FileType go nnoremap goi :GoInfo autocmd FileType go nnoremap got :GoTest autocmd FileType go nnoremap goT :GoTestFunc! @@ -303,7 +310,7 @@ autocmd FileType go IndentLinesDisable autocmd FileType go highlight link Whitespace Conceal autocmd FileType go set list listchars=tab:\|\ "keep trailing space -"--- VIM-RUST --------------------------------------- +"--- Vim-Rust ------------------------------------ augroup Racer " autocmd! autocmd FileType rust nmap gd (rust-def) @@ -318,10 +325,10 @@ augroup Racer autocmd FileType rust nmap gtR :let g:ale_linters['rust'] = g:rustlint2 augroup END -"--- Leader Key ------------------------------------- +"--- Leader Key ---------------------------------- let mapleader = "," -"--- FZF -------------------------------------------- +"--- Fzf ----------------------------------------- let maplocalleader = "\" nnoremap :Lines nnoremap f :Files