aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Nazaryev <sergey@nazaryev.ru>2017-10-10 17:46:50 +0300
committerSergey Nazaryev <sergey@nazaryev.ru>2017-10-10 17:46:50 +0300
commitb5ae83095898c8dac9e18f73487f70a746a0fd28 (patch)
treeacf262e3e46d1bd51973c493057f7a8abad450eb
parent2fc7f9dc891444d94b9e45705d9afad1fb960c5c (diff)
downloaddotfiles-b5ae83095898c8dac9e18f73487f70a746a0fd28.zip
dotfiles-b5ae83095898c8dac9e18f73487f70a746a0fd28.tar.gz
dotfiles-b5ae83095898c8dac9e18f73487f70a746a0fd28.tar.bz2
Move PS1 to seperated file, fix HISTSIZE
-rw-r--r--bash_env8
-rw-r--r--bash_ps17
-rwxr-xr-xinstall.sh4
3 files changed, 15 insertions, 4 deletions
diff --git a/bash_env b/bash_env
index ae1075d..10978be 100644
--- a/bash_env
+++ b/bash_env
@@ -4,13 +4,13 @@ XKB_DEFAULT_LAYOUT=us,ru
XKB_DEFAULT_OPTIONS=grp:caps_toggle,grp_led:scroll,compose:ralt
LANG="en_US.UTF-8"
-PS1="\[\e[01;32m\]\u@\[\e[0m\]\[\e[00;33m\]\h\[\e[0m\]\[\e[00;37m\] in \[\e[0m\]\[\e[00;36m\]\w\[\e[0m\]\[\e[00;37m\] \[\e[0m\]\[\e[00;32m\]\n\\$\[\e[0m\]\[\e[00;37m\] \[\e[0m\]"
TERM=xterm-256color
-HISTSIZE=""
+HISTSIZE=-1
+HISTFILESIZE=-1
VISUAL=vim
EDITOR=vim
-export XKB_DEFAULT_LAYOUT XKB_DEFAULT_OPTIONS LANG PS1 TERM \
- HISTSIZE VISUAL EDITOR
+export XKB_DEFAULT_LAYOUT XKB_DEFAULT_OPTIONS LANG TERM \
+ HISTSIZE HISTFILESIZE VISUAL EDITOR
diff --git a/bash_ps1 b/bash_ps1
new file mode 100644
index 0000000..5ec54d1
--- /dev/null
+++ b/bash_ps1
@@ -0,0 +1,7 @@
+gitbranch() {
+ branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+ [ -n "$branch" ] && printf " (${branch})"
+}
+
+PS1="\[\e[01;32m\]\u@\[\e[0m\]\[\e[00;33m\]\h\[\e[0m\]\[\e[00;37m\] in \[\e[0m\]\[\e[00;36m\]\w\[\e[0m\]\[\e[00;37m\]\[\e[0m\]\[\e[00;32m\]\$(gitbranch)\n\\$\[\e[0m\]\[\e[00;37m\] \[\e[0m\]"
+export PS1
diff --git a/install.sh b/install.sh
index 886d863..88003d9 100755
--- a/install.sh
+++ b/install.sh
@@ -181,6 +181,10 @@ install_dotfile "bash" \
"$HOME/.bashrc.d/02-bash_env"
install_dotfile "bash" \
+ "$dotfilesdir/bash_ps1" \
+ "$HOME/.bashrc.d/02-bash_ps1"
+
+install_dotfile "bash" \
"$dotfilesdir/bash_aliases" \
"$HOME/.bashrc.d/02-bash_aliases"