From 6b6681aa4f82860d92929bf978de8e7e513806fb Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Tue, 17 Oct 2017 03:35:05 -0400 Subject: [PATCH 1/4] Got vim-plug to work. --- dotfiles/.bashrc | 2 +- dotfiles/.vimrc | 15 ++++++++++----- set-from-git.sh | 2 -- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index b384c21..0b0bfb7 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -130,7 +130,7 @@ bind "set menu-complete-display-prefix on" DIR_LAB="/h/u3/c7/05/mokkar/.bash_it" DIR_HOME="/home/kevin/.bash_it" # Path to the bash it configuration -export BASH_IT="$DIR_HOME" +export BASH_IT="$DIR_LAB" # Lock and Load a custom theme file # location /.bash_it/themes/ diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 36b66b5..974258d 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -11,14 +11,19 @@ " endtry set relativenumber +set background=dark syntax on set tabstop=4 set autoindent " 'h/u3/c7/05/mokkar/.vim/plugged' " '~/.vim/plugged' -" call plug#begin('h/u3/c7/05/mokkar/.vim/plugged') -" Plug 'https://github.com/whatyouhide/vim-gotham.git' -" call plug#end() -" -" colorscheme gotham +call plug#begin('h/u3/c7/05/mokkar/.vim/plugged') + +Plug 'vim-scripts/L9' +Plug 'vim-scripts/FuzzyFinder' +" Plug 'whatyouhide/vim-gotham' + +call plug#end() + +colorscheme gotham diff --git a/set-from-git.sh b/set-from-git.sh index 070be74..eaffdb2 100644 --- a/set-from-git.sh +++ b/set-from-git.sh @@ -1,8 +1,6 @@ files=".bash_aliases .bashrc .inputrc .vimrc" dir=~/linux-config/dotfiles -# mkdir $dir - for file in $files; do rm ~/$file ln -s $dir/$file ~/$file From 0c3c05563ddaa39dafb20a48005128a415414a77 Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Tue, 17 Oct 2017 04:01:18 -0400 Subject: [PATCH 2/4] Setup gvim for lab comps. --- dotfiles/.bash_aliases | 7 +++++-- dotfiles/.gvimrc | 1 + dotfiles/.vimrc | 14 +------------- dotfiles/.vimrc-runtime | 11 +++++++++++ set-from-git.sh | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 dotfiles/.gvimrc create mode 100644 dotfiles/.vimrc-runtime diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index 2566994..e24c848 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -17,7 +17,7 @@ alias l5="cd ~/258/258-labs-self/l5" alias lab="cd ~/258/258-labs-self" # bash -alias vb="vim ~/.bash_aliases" +alias vb="gvim ~/.bash_aliases" alias rba=". ~/.bashrc" # git @@ -34,7 +34,10 @@ gc(){ git commit -m "$1" } -# redshift +g(){ + gvim $1 +} + rs(){ redshift -O $1 } diff --git a/dotfiles/.gvimrc b/dotfiles/.gvimrc new file mode 100644 index 0000000..09313ae --- /dev/null +++ b/dotfiles/.gvimrc @@ -0,0 +1 @@ +set guifont=Monospace\ 15 diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 974258d..a4f4632 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -1,15 +1,3 @@ -" set runtimepath+=~/.vim_runtime -" -" source ~/.vim_runtime/vimrcs/basic.vim -" source ~/.vim_runtime/vimrcs/filetypes.vim -" source ~/.vim_runtime/vimrcs/plugins_config.vim -" source ~/.vim_runtime/vimrcs/extended.vim -" -" try -" source ~/.vim_runtime/my_configs.vim -" catch -" endtry - set relativenumber set background=dark syntax on @@ -22,7 +10,7 @@ call plug#begin('h/u3/c7/05/mokkar/.vim/plugged') Plug 'vim-scripts/L9' Plug 'vim-scripts/FuzzyFinder' -" Plug 'whatyouhide/vim-gotham' +Plug 'whatyouhide/vim-gotham' call plug#end() diff --git a/dotfiles/.vimrc-runtime b/dotfiles/.vimrc-runtime new file mode 100644 index 0000000..7b16604 --- /dev/null +++ b/dotfiles/.vimrc-runtime @@ -0,0 +1,11 @@ +set runtimepath+=~/.vim_runtime + +source ~/.vim_runtime/vimrcs/basic.vim +source ~/.vim_runtime/vimrcs/filetypes.vim +source ~/.vim_runtime/vimrcs/plugins_config.vim +source ~/.vim_runtime/vimrcs/extended.vim + +try +source ~/.vim_runtime/my_configs.vim +catch +endtry diff --git a/set-from-git.sh b/set-from-git.sh index eaffdb2..6c892cf 100644 --- a/set-from-git.sh +++ b/set-from-git.sh @@ -1,4 +1,4 @@ -files=".bash_aliases .bashrc .inputrc .vimrc" +files=".bash_aliases .bashrc .inputrc .vimrc .gvimrc" dir=~/linux-config/dotfiles for file in $files; do From 39f41bd0ef2d3e611d4fecf99deee0ffe9159b0a Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Tue, 17 Oct 2017 05:23:00 -0400 Subject: [PATCH 3/4] Minor changes. --- dotfiles/.bash_aliases | 3 ++- dotfiles/.gvimrc | 2 +- dotfiles/.vimrc | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index e24c848..78956e3 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -16,8 +16,9 @@ alias p1="cd ~/258/258-labs-self/l5/p1" alias l5="cd ~/258/258-labs-self/l5" alias lab="cd ~/258/258-labs-self" -# bash +# config alias vb="gvim ~/.bash_aliases" +alias vv="gvim ~/.vimrc" alias rba=". ~/.bashrc" # git diff --git a/dotfiles/.gvimrc b/dotfiles/.gvimrc index 09313ae..1059d3c 100644 --- a/dotfiles/.gvimrc +++ b/dotfiles/.gvimrc @@ -1 +1 @@ -set guifont=Monospace\ 15 +set guifont=Monospace\ 14 diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index a4f4632..883a8c7 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -2,11 +2,13 @@ set relativenumber set background=dark syntax on set tabstop=4 +set shiftwidth=4 set autoindent +set mouse=c " 'h/u3/c7/05/mokkar/.vim/plugged' " '~/.vim/plugged' -call plug#begin('h/u3/c7/05/mokkar/.vim/plugged') +call plug#begin('~/.vim/plugged') Plug 'vim-scripts/L9' Plug 'vim-scripts/FuzzyFinder' From 6584668aaddf7b4089568fb3910dd2f9211b199d Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Wed, 18 Oct 2017 08:53:02 -0400 Subject: [PATCH 4/4] Minor additions. --- dotfiles/.bash_aliases | 8 +++++--- dotfiles/.vimrc | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index 78956e3..f0e50cb 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -1,18 +1,19 @@ # system -alias bs="xmodmap -e \"clear Lock\"" +xmodmap -e "clear Lock" alias c="clear" shopt -s dotglob alias reb="sudo shutdown -r 0" alias sd="sudo shutdown 0" alias slp="systemctl suspend" +source /usr/share/bash-completion/completions/git # directories alias cdr="cd ~/../../" alias cdd="cd ~/Downloads" alias 221="cd ~/Documents/School/221" -alias 221lt="okular ~/Downloads/Textbook.pdf" +alias mlt="okular ~/Downloads/Textbook.pdf" -alias p1="cd ~/258/258-labs-self/l5/p1" +alias p2="cd ~/258/258-labs-self/l5/p2" alias l5="cd ~/258/258-labs-self/l5" alias lab="cd ~/258/258-labs-self" @@ -31,6 +32,7 @@ alias ga="git add *" alias gai="git add .gitignore" alias gd="git diff" alias gdc="git diff --cached" +alias gstore="git config credential.helper store" gc(){ git commit -m "$1" } diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 883a8c7..36df209 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -17,3 +17,6 @@ Plug 'whatyouhide/vim-gotham' call plug#end() colorscheme gotham + +map o +map O