mirror of
https://github.com/lloeki/dotfiles.git
synced 2025-12-06 15:34:40 +01:00
Merge branch 'master' of github.com:lloeki/dotfiles
Conflicts: home/profile
This commit is contained in:
commit
02b9c5229f
4 changed files with 9 additions and 11 deletions
|
|
@ -1,10 +1,5 @@
|
||||||
## bash_profile, called for login shells
|
## bash_profile, called for login shells
|
||||||
|
|
||||||
# dotfiles locations
|
|
||||||
DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ${BASH_SOURCE[0]})")" && pwd)"
|
|
||||||
DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )"
|
|
||||||
DOTFILES_BASH_DIR="$DOTFILES_ROOT_DIR/bash"
|
|
||||||
|
|
||||||
# include .profile
|
# include .profile
|
||||||
source ~/.profile
|
source ~/.profile
|
||||||
|
|
||||||
|
|
|
||||||
4
bash/rc
4
bash/rc
|
|
@ -5,11 +5,13 @@ source $DOTFILES_BASH_DIR/history
|
||||||
source $DOTFILES_BASH_DIR/term_title
|
source $DOTFILES_BASH_DIR/term_title
|
||||||
source $DOTFILES_BASH_DIR/completion
|
source $DOTFILES_BASH_DIR/completion
|
||||||
|
|
||||||
|
# Make bash check its window size after a process completes
|
||||||
|
shopt -s checkwinsize
|
||||||
|
|
||||||
# easy on spelling mistakes
|
# easy on spelling mistakes
|
||||||
shopt -s cdspell
|
shopt -s cdspell
|
||||||
|
|
||||||
# turn off distractive bells
|
# turn off distractive bells
|
||||||
set bell-style none
|
set bell-style none
|
||||||
|
|
||||||
|
|
||||||
# vim: ft=sh
|
# vim: ft=sh
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,11 @@
|
||||||
## .profile
|
## .profile
|
||||||
|
|
||||||
|
# dotfiles locations
|
||||||
|
DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ~/.profile)")" && pwd)"
|
||||||
|
DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )"
|
||||||
|
DOTFILES_ZSH_DIR="$DOTFILES_ROOT_DIR/zsh"
|
||||||
|
DOTFILES_BASH_DIR="$DOTFILES_ROOT_DIR/bash"
|
||||||
|
|
||||||
. "$DOTFILES_ROOT_DIR/shell/autoload"
|
. "$DOTFILES_ROOT_DIR/shell/autoload"
|
||||||
|
|
||||||
export PATH
|
export PATH
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,5 @@
|
||||||
# zprofile, called for login shells
|
# zprofile, called for login shells
|
||||||
|
|
||||||
# dotfiles locations
|
|
||||||
DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ~/.zprofile)")" && pwd)"
|
|
||||||
DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )"
|
|
||||||
DOTFILES_ZSH_DIR="$DOTFILES_ROOT_DIR/zsh"
|
|
||||||
|
|
||||||
emulate sh
|
emulate sh
|
||||||
source ~/.profile
|
source ~/.profile
|
||||||
emulate zsh
|
emulate zsh
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue