Merge branch 'master' of github.com:Mkaysi/shell-things

.gitignore

@@ -1,3 +1,4 @@
 # It seems that running install.sh causes <filename>~ files in this git repo. They are lockfiles.
 *~
 push.sh
+merge.sh

bashrc

@@ -7,6 +7,11 @@
 #   Functions                   ZGC5QQ
 #   Tmux (example)              4G2W9C
 
+# For Mac OS X + SSH sessions. bashrc must be sourced by hand at least once.
+echo "if [ -f ~/.bashrc ]; then
+    source ~/.bashrc
+fi" > ~/.bash_profile
+
 #####   Defaults etc...             M0TZLS  #####
 
 # ~/.bashrc: executed by bash(1) for non-login shells.
@@ -139,11 +144,6 @@ if [ -f ~/.bash_environment ]; then
     source ~/.bash_environment
 fi
 
-# .bashenv (Yes, I know that this is sourced by every bash session even if this isn't here, but I just want to write it).
-if [ -f ~/.bashenv ]; then
-    source ~/.bashenv
-fi
-
 # Things after this are just examples and should be put to some other file, which issourced above.
 
 # Sets the default editor. I prefer nano to vim and so on, so I want it to be nano. If you don't like terminal based text editors, change "nano" to gedit (Gnome) or Kate (KDE).
@@ -290,6 +290,9 @@ alias sshguard-show-bans="sudo iptables -L sshguard --line-numbers"
 # Enter ban number as arguement. You can see ban numbers with previous command.
 alias sshguard-unban="sudo iptables -D sshguard "
 
+# This needs something which makes it easy to remember.
+alias KILL="killall -KILL "
+
 # Allow custom aliases to be put in .aliases or .bash_aliases .
 
 # .aliases

tmux.conf

@@ -22,3 +22,8 @@ set -g base-index 1
 # Sets 0 as window 10 (in my keyboard, numbers are 1234567890)
 bind-key 0 select-window -t :10
 
+# Enables mouse
+set -g mode-mouse on
+
+# Enables colours
+set -g default-terminal "screen-256color"

zshrc

@@ -234,6 +234,9 @@ alias sshguard-show-bans="sudo iptables -L sshguard --line-numbers"
 # Enter ban number as arguement. You can see ban numbers with previous command.
 alias sshguard-unban="sudo iptables -D sshguard "
 
+# This needs something which makes it easy to remember.
+alias KILL="killall -KILL "
+
 # Allow custom aliases to be put in .aliases or .zsh_aliases .
 
 # .aliases