From 001b1762941c6607f1728d70b28b5460055c19c7 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Fri, 4 Dec 2020 20:44:41 -0500 Subject: [PATCH 1/5] turn off powerline characters in ariline, and set vimdiff as difftool --- .gitconfig | 2 ++ .vimrc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 76e5eb5..52a0446 100644 --- a/.gitconfig +++ b/.gitconfig @@ -12,3 +12,5 @@ date = format:%Y-%m-%d %H:%M:%S [format] pretty = format:'%C(yellow)%h %Cred%ad %Cblue%an %Cgreen%d %Creset%s' +[diff] + tool = vimdiff diff --git a/.vimrc b/.vimrc index 60c0b46..e3f5590 100644 --- a/.vimrc +++ b/.vimrc @@ -37,8 +37,8 @@ let g:netrw_winsize = 25 "----airline tabs for buffers------- let g:airline#extensions#tabline#enabled = 1 let g:airline_theme = 'dark' -"let g:tmuxline_powerline_separators = 0 -let g:airline_powerline_fonts = 1 +let g:tmuxline_powerline_separators = 0 +let g:airline_powerline_fonts = 0 let mapleader = ";" set showcmd map a :bn From 2569f31f87f2309e56824cb86fb081c4882f424d Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Fri, 4 Dec 2020 21:20:54 -0500 Subject: [PATCH 2/5] add plugin manager and resurrect --- .tmux.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.tmux.conf b/.tmux.conf index cb82a4f..ab92bbc 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -4,3 +4,10 @@ bind -r h select-pane -L # move left bind -r j select-pane -D # move down bind -r k select-pane -U # move up bind -r l select-pane -R # move right + +#plugin manager for install tmux-resurrect +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-resurrect' + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run '~/.tmux/plugins/tpm/tpm' From 05f8f35da4c3955610fe0bc8ce956a452ee47647 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Sun, 6 Dec 2020 22:20:08 -0500 Subject: [PATCH 3/5] include cloning powerline fonts and tmux plugin manager to facilitate tmux-resurrect --- setup.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/setup.sh b/setup.sh index 3ac05c9..015dcff 100755 --- a/setup.sh +++ b/setup.sh @@ -30,6 +30,44 @@ do ln -s $dir/$file ~/$file done +#----------------------------------------------------------install power line fonts------------------------------------------------------------------------ + +if [ ! -d ~/fonts ] +then + while true; do + read -p "do you want to install powerline fonts from https://github.com/powerline/fonts?" yn + case $yn in + [Yy]* ) + git clone https://github.com/powerline/fonts; + cd fonts; + ./install.sh; + break;; + [Nn]* ) + exit;; + * ) echo "Please answer yes or no.";; + esac + done +fi + + +#----------------------------------------------------------install tmux plugin manager and tmux resurrect-------------------------------------------------- + +if [ ! -d ~/.tmux/plugins/tpm ] +then + while true; do + read -p "do you want to install the tmux plugin manager from https://github.com/tmux-plugins/tpm" yn + case $yn in + [Yy]* ) + git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm; + break;; + [Nn]* ) + exit;; + * ) echo "Please answer yes or no.";; + esac + done +fi + + #----------------------------------------------------------see if Vundle has been cloned yet and do so----------------------------------------------------- if [ ! -d ~/.vim ] From 64f25e862f6f35789b139acfbc2d89cd8ea8566a Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Mon, 7 Dec 2020 03:58:11 +0000 Subject: [PATCH 4/5] turn powerline stuff on by default, and setup go & powerline install pieces --- .vimrc | 4 ++-- setup.sh | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index e3f5590..f3924f3 100644 --- a/.vimrc +++ b/.vimrc @@ -37,8 +37,8 @@ let g:netrw_winsize = 25 "----airline tabs for buffers------- let g:airline#extensions#tabline#enabled = 1 let g:airline_theme = 'dark' -let g:tmuxline_powerline_separators = 0 -let g:airline_powerline_fonts = 0 +let g:tmuxline_powerline_separators = 1 +let g:airline_powerline_fonts = 1 let mapleader = ";" set showcmd map a :bn diff --git a/setup.sh b/setup.sh index 015dcff..5877c71 100755 --- a/setup.sh +++ b/setup.sh @@ -30,6 +30,24 @@ do ln -s $dir/$file ~/$file done +#----------------------------------------------------------install go and go-powerline-------------------------------------------------------------------- + +if [ -z "$GOPATH" ] +then + while true; do + read -p "do you want to install golang and go-powerline?" yn + case $yn in + [Yy]* ) + sudo apt-get install golang; + go get -u github.com/justjanne/powerline-go; + break;; + [Nn]* ) + exit;; + * ) echo "Please answer yes or no.";; + esac + done +fi + #----------------------------------------------------------install power line fonts------------------------------------------------------------------------ if [ ! -d ~/fonts ] From de074893b175ac1ff98590bdf00b76fe05154622 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Mon, 7 Dec 2020 04:13:30 +0000 Subject: [PATCH 5/5] clone fonts into top level directory --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 5877c71..67841fb 100755 --- a/setup.sh +++ b/setup.sh @@ -56,7 +56,7 @@ then read -p "do you want to install powerline fonts from https://github.com/powerline/fonts?" yn case $yn in [Yy]* ) - git clone https://github.com/powerline/fonts; + git clone https://github.com/powerline/fonts ~/fonts; cd fonts; ./install.sh; break;;