diff --git a/dot_bashrc b/dot_bashrc
index bc8097f..ced4958 100644
--- a/dot_bashrc
+++ b/dot_bashrc
@@ -14,6 +14,22 @@
 bind '"\e[A":history-search-backward'
 bind '"\e[B":history-search-forward'
 
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+
 # ---------------------------------------------------------------------------
 #  EDITOR
 # ---------------------------------------------------------------------------
@@ -68,6 +84,8 @@ alias dmesg='dmesg -T'
 alias grep='grep --color'
 alias vi='/usr/bin/vim'
 
+alias serve="python3 -m $(python3 -c 'import sys; print("http.server" if sys.version_info[:2] > (2,7) else "SimpleHTTPServer")')"
+
 #----------------------------------------------------------------------------
 
 if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
@@ -88,3 +106,12 @@ fi
 if [ -f "$HOME/.pythonz/pythons/CPython-3.9.1/bin/pew" ]; then
     source "$(pew shell_config)"
 fi
+
+# -------------------------------------------------------------
+# Source all .bashrc files
+# -------------------------------------------------------------
+
+for file in ~/.bashrc.d/*.bashrc; do
+        . "$file"
+done
+
diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index e39cab8..608765d 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -3,6 +3,8 @@
 	name = {{ .git_alias }}
 [pull]
 	rebase = false
+[push]
+        default = current
 [alias]
   a = add
   c = commit
@@ -17,3 +19,5 @@
   p = push -u origin
   pu = pull
   s = status
+[include]
+  path = ~/.gitconfig_custom.inc
diff --git a/dot_tigrc b/dot_tigrc
index 4671ed4..9a3dca2 100644
--- a/dot_tigrc
+++ b/dot_tigrc
@@ -2,5 +2,5 @@
 bind status P !git p
 
 # Delete file
-bind status ! !rm %(file)
+#bind status ! !rm %(file)