diff --git a/.vimrc b/.vimrc index 4d0397f..5162c37 100644 --- a/.vimrc +++ b/.vimrc @@ -7,6 +7,7 @@ filetype plugin on syntax on set tabstop=4 set tw=80 +set linebreak set colorcolumn=80 set shiftwidth=4 set autoindent @@ -14,6 +15,11 @@ set mouse=c set clipboard=unnamedplus set foldmethod=marker set linespace=5 +" set listchars=tab:\|\ +" set list +set cursorcolumn +set cursorline +set timeoutlen=300 " }}} set x=y " autocmd VimResized * wincmd = @@ -31,7 +37,6 @@ call plug#begin('~/.vim/plugged') Plug 'vim-scripts/L9' " Plug 'vim-scripts/FuzzyFinder' Plug 'whatyouhide/vim-gotham' -Plug 'nathanaelkane/vim-indent-guides' Plug 'flazz/vim-colorschemes' Plug '907th/vim-auto-save' let g:auto_save = 1 @@ -72,7 +77,7 @@ map :wqa map :qa! map :AutoSaveToggle map :LLPStartPreview -set pastetoggle= +set pastetoggle= map O " For splits. @@ -86,7 +91,6 @@ nnoremap | let mapleader="\" nnoremap e o -nnoremap f za nnoremap ff :set foldmethod=marker zM nnoremap h :set hlsearch! hlsearch? nnoremap m :call cursor(0, len(getline('.'))/2) @@ -94,8 +98,10 @@ nnoremap pli :PlugInstall nnoremap plc :PlugClean nnoremap plu :PlugUpdate nnoremap r :.,.+s///g +nnoremap rv :source $MYVIMRC nnoremap R :%s///g nnoremap s :set syn=sh +nnoremap z za " }}} Mappings " " Local Mappings {{{ " diff --git a/NZXT-terminator b/NZXT-terminator index 10ac648..237dedb 100644 --- a/NZXT-terminator +++ b/NZXT-terminator @@ -11,6 +11,10 @@ go_up = k new_tab = t new_window = n + resize_down = j + resize_left = h + resize_right = l + resize_up = k split_horiz = i split_vert = o [layouts] @@ -24,13 +28,20 @@ [plugins] [profiles] [[default]] + background_darkness = 0.89 background_image = None + background_type = transparent copy_on_selection = True cursor_color = "#b9b9b9" custom_command = env TERM=xterm-256color bash - font = Monospace 8.5 + font = Ubuntu Mono 10 foreground_color = "#0077ff" palette = "#000000:#aa0000:#00aa00:#aa5500:#0000aa:#aa00aa:#00aaaa:#aaaaaa:#555555:#ff5555:#55ff55:#ffff55:#5555ff:#ff55ff:#55ffff:#ffffff" scrollbar_position = hidden use_custom_command = True use_system_font = False + [[light]] + background_color = "#fdf6e3" + background_image = None + foreground_color = "#657b83" + palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3" diff --git a/set-from-git.sh b/set-from-git.sh index d2bebbd..85be14b 100755 --- a/set-from-git.sh +++ b/set-from-git.sh @@ -1,6 +1,5 @@ -dot_dir=~/linux-config - # dotfiles +dot_dir=~/linux-config dotfiles="bashrc gitconfig inputrc vimrc" cd $dot_dir for dotfile in $dotfiles; do @@ -9,10 +8,11 @@ for dotfile in $dotfiles; do done # terminator +dot_dir=~/linux-config term_dir=~/.config/terminator pc=$(hostname) rm "$dot_dir"/"$pc"-terminator -ln "$term_dir"/config $dot_dir/"$pc"-terminator +cp "$term_dir"/config $dot_dir/"$pc"-terminator # UltiSnips ln -s $dot_dir/UltiSnips ~/.vim