From af9e48be72247c89b075ef1328b04c662efad15e Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Wed, 24 Jan 2018 13:07:09 -0500 Subject: [PATCH] Update set-from-git for Terminator - Set default terminal editor to vim (.bashrc) - Auto-install plugged (.vimrc) --- dotfiles/.bashrc | 2 ++ dotfiles/.vimrc | 8 ++++++++ dotfiles/termConfig | 3 ++- set-from-git.sh | 8 ++++---- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 3295d45..23a7711 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -184,3 +184,5 @@ source "$BASH_IT"/bash_it.sh # source /etc/environment export QSYS_ROOTDIR="/home/kevin/usr/altera_lite/16.0/quartus/sopc_builder/bin" +export EDITOR='vim' +export VISUAL='vim' diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index d493772..688cd86 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -1,6 +1,7 @@ set relativenumber set background=dark " set t_Co=256 +filetype plugin on syntax on set tabstop=4 set shiftwidth=4 @@ -12,6 +13,13 @@ autocmd VimResized * wincmd = " 'h/u3/c7/05/mokkar/.vim/plugged' " '~/.vim/plugged' + +" plug +if empty(glob('~/.vim/autoload/plug.vim')) + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC +endif call plug#begin('~/.vim/plugged') Plug 'vim-scripts/L9' diff --git a/dotfiles/termConfig b/dotfiles/termConfig index e5d9384..a55fafb 100644 --- a/dotfiles/termConfig +++ b/dotfiles/termConfig @@ -27,8 +27,9 @@ copy_on_selection = True cursor_color = "#b9b9b9" custom_command = env TERM=xterm-256color bash - font = Noto Mono 9 + font = Monospace 12 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 diff --git a/set-from-git.sh b/set-from-git.sh index b1a5ffa..f45a590 100755 --- a/set-from-git.sh +++ b/set-from-git.sh @@ -1,5 +1,5 @@ # home -files=".bash_aliases .bashrc .inputrc .vimrc .gvimrc .profile" +files=".bash_aliases .bashrc .inputrc .vimrc .gvimrc" dotDir=~/linux-config/dotfiles for file in $files; do @@ -8,6 +8,6 @@ for file in $files; do done # terminator -termDir=~/.config/terminator/ -rm $termDir/config -ln -s $dotDir/termConfig $termDir/config +termDir=~/.config/terminator +rm $termDir/config +ln -s $dotDir/termConfig "$termDir"/config