diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index 65f393e..b0febd0 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -1,5 +1,5 @@ # system -alias bs="xmodmap -e \"clear Lock\"" +xmodmap -e "clear Lock" alias c="clear" shopt -s dotglob alias reb="sudo shutdown -r 0" @@ -10,14 +10,16 @@ alias s="systemctl suspend" alias cdr="cd ~/../../" alias cdd="cd ~/Downloads" alias 221="cd ~/Documents/School/221" -alias 221lt="okular ~/Downloads/Textbook.pdf" +alias mt="okular ~/Documents/School/221/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" -# bash -alias vb="vim ~/.bash_aliases" +# config +alias vb="gvim ~/.bash_aliases" +alias vv="gvim ~/.vimrc" alias rba=". ~/.bashrc" # git @@ -30,11 +32,15 @@ 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" } -# redshift +g(){ + gvim $1 +} + rs(){ redshift -O $1 } 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/.gvimrc b/dotfiles/.gvimrc new file mode 100644 index 0000000..1059d3c --- /dev/null +++ b/dotfiles/.gvimrc @@ -0,0 +1 @@ +set guifont=Monospace\ 14 diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 36b66b5..36df209 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -1,24 +1,22 @@ -" 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 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') -" Plug 'https://github.com/whatyouhide/vim-gotham.git' -" call plug#end() -" -" colorscheme gotham +call plug#begin('~/.vim/plugged') + +Plug 'vim-scripts/L9' +Plug 'vim-scripts/FuzzyFinder' +Plug 'whatyouhide/vim-gotham' + +call plug#end() + +colorscheme gotham + +map o +map O 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 070be74..6c892cf 100644 --- a/set-from-git.sh +++ b/set-from-git.sh @@ -1,8 +1,6 @@ -files=".bash_aliases .bashrc .inputrc .vimrc" +files=".bash_aliases .bashrc .inputrc .vimrc .gvimrc" dir=~/linux-config/dotfiles -# mkdir $dir - for file in $files; do rm ~/$file ln -s $dir/$file ~/$file