From 83bf25982b891ec1db4da38c698d366d288c8ba7 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Sat, 29 Oct 2011 16:49:14 +0300 Subject: [PATCH 1/7] bashrc: What is bashenv? --- bashrc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bashrc b/bashrc index 4c8c5dc5..9b90b812 100644 --- a/bashrc +++ b/bashrc @@ -139,11 +139,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). From 50b8ce7343b21449ad7f7a029d83edf9fe3addac Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Sat, 29 Oct 2011 16:52:37 +0300 Subject: [PATCH 2/7] bashrc: Tell bash_profile to source .bashrc. Mac OS X... SSH sessions... NOTE: bashrc must be sourced by hand at least once. --- bashrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bashrc b/bashrc index 9b90b812..17c7b21a 100644 --- a/bashrc +++ b/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. From 748090b325134850a0d5de55a17310855a4c0949 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Sun, 6 Nov 2011 12:52:36 +0200 Subject: [PATCH 3/7] Added push.sh to gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d3ee8da4..d89e059b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # It seems that running install.sh causes ~ files in this git repo. They are lockfiles. *~ push.sh +merge.sh From fb1c1db353aac1e94df66bb3c6a55b963870c93d Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Sat, 12 Nov 2011 20:42:26 +0200 Subject: [PATCH 4/7] bashrc & zshrc: add KILL alias. killall -KILL takes too long time to write. --- bashrc | 3 +++ zshrc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/bashrc b/bashrc index 17c7b21a..6e48645d 100644 --- a/bashrc +++ b/bashrc @@ -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 diff --git a/zshrc b/zshrc index 7bab51c7..73c8c886 100644 --- a/zshrc +++ b/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 From ab9f6a213c3c72cf2b89f796ef2f26a4dc12eff0 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Mon, 14 Nov 2011 17:07:53 +0200 Subject: [PATCH 5/7] tmux.conf: enable mouse --- tmux.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tmux.conf b/tmux.conf index 6b094ba2..4ea4c124 100755 --- a/tmux.conf +++ b/tmux.conf @@ -22,3 +22,5 @@ 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 From 7efe627768c4eb4934faad0b2265a53bc4972afd Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Fri, 25 Nov 2011 14:10:39 +0200 Subject: [PATCH 6/7] bashrc: Removed the > which is annoying to bash users. --- bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc b/bashrc index 6e48645d..18dcb1f4 100644 --- a/bashrc +++ b/bashrc @@ -10,7 +10,7 @@ # 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 +fi" > ~/.bash_profile ##### Defaults etc... M0TZLS ##### From 27b1c14118a886533d378eb8adadc8135fad45b8 Mon Sep 17 00:00:00 2001 From: Mika Suomalainen Date: Sat, 3 Dec 2011 17:13:15 +0200 Subject: [PATCH 7/7] tmux.conf: Use screen-256color as $TERM . It might have nicer colours, but I don't know. --- tmux.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tmux.conf b/tmux.conf index 4ea4c124..843cbffd 100755 --- a/tmux.conf +++ b/tmux.conf @@ -24,3 +24,6 @@ bind-key 0 select-window -t :10 # Enables mouse set -g mode-mouse on + +# Enables colours +set -g default-terminal "screen-256color"