dotfiles

commit 10c912751657618b1753f44c68f637a05db686ea (patch)
parent 15048442a2d01c459b959e484f75f7a68e306df7
Author: Alexander Karle <akarle@umass.edu>
Date:   Wed, 27 Jun 2018 11:38:17 -0400

Small config tweaks

1. History increase for bash
2. Neovim terminal maps + inccommand set
3. A couple new plugins
4. Commented the option for vi keys in inputrc

Diffstat:
M
bash/bashrc
 | 
4
++--
M
inputrc
 | 
4
++++
M
neovim/init.vim
 | 
14
+++++++++-----
M
vim/vimrc
 | 
3
+++

4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/bash/bashrc b/bash/bashrc
@@ -19,8 +19,8 @@ HISTCONTROL=ignoreboth
 shopt -s histappend
 
 # for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
+HISTSIZE=10000
+HISTFILESIZE=20000
 
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
diff --git a/inputrc b/inputrc
@@ -1,3 +1,7 @@
 # tab completion
 Tab: menu-complete
 "\e[Z": menu-complete-backward
+
+# vi keys!
+# set editing-mode vi
+# set keymap vi-command
diff --git a/neovim/init.vim b/neovim/init.vim
@@ -7,8 +7,12 @@ set runtimepath+=~/.vim,~/.vim/after
 set packpath+=~/.vim
 source ~/.vimrc
 
-" Custom mappings
-tnoremap <C-h> <C-\><C-n><C-w>hA
-tnoremap <C-j> <C-\><C-n><C-w>jA
-tnoremap <C-k> <C-\><C-n><C-w>kA
-tnoremap <C-l> <C-\><C-n><C-w>lA
+" Custom mappings for terminal
+tnoremap <ESC> <C-\><C-n>
+tnoremap <M-[> <Esc>
+
+" no numbers in terminal
+autocmd TermOpen * setlocal nonumber
+
+" incrementally show substitutions!
+set inccommand=nosplit
diff --git a/vim/vimrc b/vim/vimrc
@@ -73,6 +73,7 @@ set directory=~/.vim/swp,.
 if executable('rg')
     set grepprg=rg\ --vimgrep\ --no-heading
     set grepformat=%f:%l:%c:%m,%f:%l:%m
+    let $FZF_DEFAULT_COMMAND = 'rg --files --hidden --glob "!.git/*"'
 endif
 " }}}
 
@@ -90,6 +91,8 @@ if filereadable(expand("~/.vim/autoload/plug.vim"))
     Plug 'octol/vim-cpp-enhanced-highlight'
     Plug 'pangloss/vim-javascript'
     Plug 'posva/vim-vue'
+    Plug 'cespare/vim-toml'
+    Plug 'cakebaker/scss-syntax.vim'
 
     " Plug nerdtree for tree package explorer
     Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }