From 1c17ba938310a0b2338dd93a81158ce152e3988c Mon Sep 17 00:00:00 2001 From: Jannik Zander Date: Sat, 21 May 2016 07:36:29 +0200 Subject: [PATCH] Move bash config to .config/bash --- .bash_profile | 3 --- .bashrc => .config/bash/bashrc | 2 +- {.bash => .config/bash/profile.d}/aliases | 0 {.bash => .config/bash/profile.d}/completion | 0 {.bash => .config/bash/profile.d}/exports | 2 +- {.bash => .config/bash/profile.d}/extra | 0 {.bash => .config/bash/profile.d}/functions | 0 {.bash => .config/bash/profile.d}/fzf.bash | 0 {.bash => .config/bash/profile.d}/fzf.functions | 0 .../bash/profile.d}/git-completion.bash | 0 {.bash => .config/bash/profile.d}/git-prompt.sh | 0 {.bash => .config/bash/profile.d}/options | 0 {.bash => .config/bash/profile.d}/paths | 0 {.bash => .config/bash/profile.d}/prompt | 0 {.bash => .config/bash/profile.d}/solarized | 0 .profile | 2 +- .vimrc | 12 +++++++----- 17 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 .bash_profile rename .bashrc => .config/bash/bashrc (93%) rename {.bash => .config/bash/profile.d}/aliases (100%) rename {.bash => .config/bash/profile.d}/completion (100%) rename {.bash => .config/bash/profile.d}/exports (96%) rename {.bash => .config/bash/profile.d}/extra (100%) rename {.bash => .config/bash/profile.d}/functions (100%) rename {.bash => .config/bash/profile.d}/fzf.bash (100%) rename {.bash => .config/bash/profile.d}/fzf.functions (100%) rename {.bash => .config/bash/profile.d}/git-completion.bash (100%) rename {.bash => .config/bash/profile.d}/git-prompt.sh (100%) rename {.bash => .config/bash/profile.d}/options (100%) rename {.bash => .config/bash/profile.d}/paths (100%) rename {.bash => .config/bash/profile.d}/prompt (100%) rename {.bash => .config/bash/profile.d}/solarized (100%) diff --git a/.bash_profile b/.bash_profile deleted file mode 100644 index 0e21e59..0000000 --- a/.bash_profile +++ /dev/null @@ -1,3 +0,0 @@ -# ~/.bash_profile - -[ -f "${HOME}/.bashrc" ] && source "${HOME}/.bashrc" diff --git a/.bashrc b/.config/bash/bashrc similarity index 93% rename from .bashrc rename to .config/bash/bashrc index d1bb2d7..5c2c08c 100644 --- a/.bashrc +++ b/.config/bash/bashrc @@ -22,7 +22,7 @@ echo Now running on $PLATFORM platform # Load settings -for file in ${HOME}/.bash/*; do +for file in ${HOME}/.config/bash/profile.d/*; do [ -f "$file" ] && source "$file"; done; diff --git a/.bash/aliases b/.config/bash/profile.d/aliases similarity index 100% rename from .bash/aliases rename to .config/bash/profile.d/aliases diff --git a/.bash/completion b/.config/bash/profile.d/completion similarity index 100% rename from .bash/completion rename to .config/bash/profile.d/completion diff --git a/.bash/exports b/.config/bash/profile.d/exports similarity index 96% rename from .bash/exports rename to .config/bash/profile.d/exports index 8dd1031..303799e 100644 --- a/.bash/exports +++ b/.config/bash/profile.d/exports @@ -9,7 +9,7 @@ export HISTFILESIZE=$HISTSIZE; export HISTCONTROL=ignoreboth; # Make some commands not show up in history export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"; -#export HISTFILE="$HOME/.bash_history"; +export HISTFILE="$HOME/.cache/bash/history"; # Whenever displaying the prompt, write the previous line to disk export PROMPT_COMMAND="history -a"; diff --git a/.bash/extra b/.config/bash/profile.d/extra similarity index 100% rename from .bash/extra rename to .config/bash/profile.d/extra diff --git a/.bash/functions b/.config/bash/profile.d/functions similarity index 100% rename from .bash/functions rename to .config/bash/profile.d/functions diff --git a/.bash/fzf.bash b/.config/bash/profile.d/fzf.bash similarity index 100% rename from .bash/fzf.bash rename to .config/bash/profile.d/fzf.bash diff --git a/.bash/fzf.functions b/.config/bash/profile.d/fzf.functions similarity index 100% rename from .bash/fzf.functions rename to .config/bash/profile.d/fzf.functions diff --git a/.bash/git-completion.bash b/.config/bash/profile.d/git-completion.bash similarity index 100% rename from .bash/git-completion.bash rename to .config/bash/profile.d/git-completion.bash diff --git a/.bash/git-prompt.sh b/.config/bash/profile.d/git-prompt.sh similarity index 100% rename from .bash/git-prompt.sh rename to .config/bash/profile.d/git-prompt.sh diff --git a/.bash/options b/.config/bash/profile.d/options similarity index 100% rename from .bash/options rename to .config/bash/profile.d/options diff --git a/.bash/paths b/.config/bash/profile.d/paths similarity index 100% rename from .bash/paths rename to .config/bash/profile.d/paths diff --git a/.bash/prompt b/.config/bash/profile.d/prompt similarity index 100% rename from .bash/prompt rename to .config/bash/profile.d/prompt diff --git a/.bash/solarized b/.config/bash/profile.d/solarized similarity index 100% rename from .bash/solarized rename to .config/bash/profile.d/solarized diff --git a/.profile b/.profile index c39cf65..df7e50e 100644 --- a/.profile +++ b/.profile @@ -6,6 +6,6 @@ # if running bash if [ -n "${BASH_VERSION}" ]; then # source the users bashrc if it exists - [ -f "${HOME}/.bashrc" ] && source "${HOME}/.bashrc + [ -f "${HOME}/.config/bash/bashrc" ] && source "${HOME}/.config/bash/bashrc" fi diff --git a/.vimrc b/.vimrc index 359cf9f..93b117f 100644 --- a/.vimrc +++ b/.vimrc @@ -1,6 +1,13 @@ " ~/.vimrc +" Section: Environment {{{1 set nocompatible +set directory=$HOME/.cache/vim/swap +set backupdir=$HOME/.cache/vim/backup +set undodir=$HOME/.cache/vim/undo +set viminfo+=n$HOME/.local/share/vim/viminfo +"set rtp=~/$HOME/.config/vim,~/$HOME/.config/vim/after,$VIM,$VIMRUNTIME + if empty(glob('$HOME/.config/vim/autoload/plug.vim')) silent !curl -fLo $HOME/.config/vim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim @@ -85,11 +92,6 @@ endif set background=light set number -set undodir=~/.cache/vim/undo " vim will not create this directory. -set directory=~/.cache/vim/swap " vim will not create this directory. -set backupdir=~/.cache/vim/backup " vim will not create this directory. -set viminfo+=n~/.local/share/vim/viminfo - " Plugin Settings {{{2 -- 2.43.0