diff --git a/README.md b/README.md index ef3678c..7ca2da2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,15 @@ ## Vim ```bash -ln -sv ${PWD}/vimrc ~/.vimrc -git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim +ln -sv ${PWD}/vimrc ${HOME}/.vimrc +git clone https://github.com/VundleVim/Vundle.vim.git ${HOME}/.vim/bundle/Vundle.vim +``` + +## Bash + +```shell +ln -sv ${PWD}/bashrc.d/ ${HOME}/.bashrc.d +ln -sv ${PWD}/bashrc ${HOME}/.bashrc +ln -sv ${PWD}/bash_profile ${HOME}/.bash_profile ``` diff --git a/bash_profile b/bash_profile new file mode 100644 index 0000000..baaaa32 --- /dev/null +++ b/bash_profile @@ -0,0 +1,8 @@ +# .bash_profile + +# Get the aliases and functions +if [ -f ~/.bashrc ]; then + . ~/.bashrc +fi + +# User specific environment and startup programs diff --git a/bashrc b/bashrc new file mode 100644 index 0000000..1ed1d53 --- /dev/null +++ b/bashrc @@ -0,0 +1,25 @@ +# .bashrc + +# Source global definitions +if [ -f /etc/bashrc ]; then + . /etc/bashrc +fi + +# User specific environment +if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]; then + PATH="$HOME/.local/bin:$HOME/bin:$PATH" +fi +export PATH + +# Uncomment the following line if you don't like systemctl's auto-paging feature: +# export SYSTEMD_PAGER= + +# User specific aliases and functions +if [ -d ~/.bashrc.d ]; then + for rc in ~/.bashrc.d/*; do + if [ -f "$rc" ]; then + . "$rc" + fi + done +fi +unset rc diff --git a/bashrc.d/direnv b/bashrc.d/direnv new file mode 100644 index 0000000..2ee86a1 --- /dev/null +++ b/bashrc.d/direnv @@ -0,0 +1,3 @@ +if [ -f `which direnv` ]; then + eval "$(direnv hook bash)" +fi diff --git a/bashrc.d/editor b/bashrc.d/editor new file mode 100644 index 0000000..56a09b1 --- /dev/null +++ b/bashrc.d/editor @@ -0,0 +1 @@ +export VISUAL=vim diff --git a/bashrc.d/powerline b/bashrc.d/powerline new file mode 100644 index 0000000..45c301a --- /dev/null +++ b/bashrc.d/powerline @@ -0,0 +1,6 @@ +if [ -f `which powerline-daemon` ]; then + powerline-daemon -q + POWERLINE_BASH_CONTINUATION=1 + POWERLINE_BASH_SELECT=1 + . /usr/share/powerline/bash/powerline.sh +fi diff --git a/vimrc b/vimrc index b13b156..6e6bba3 100644 --- a/vimrc +++ b/vimrc @@ -24,6 +24,7 @@ Plugin 'junegunn/fzf' Plugin 'scrooloose/syntastic' Plugin 'hashivim/vim-terraform' Plugin 'valloric/youcompleteme' +Plugin 'vimwiki/vimwiki' " plugin from http://vim-scripts.org/vim/scripts.html " Plugin 'L9'