From 327fc29930b43556a69dd5f69e61f8c3997311f7 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Wed, 1 Jul 2020 11:51:53 +0200
Subject: [PATCH] Update zshrc and tmux.conf

---
 tmux.conf |  4 +---
 zshrc     | 13 ++++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/tmux.conf b/tmux.conf
index 0637fd6..7e07ece 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -9,7 +9,7 @@ set-option -g set-titles on
 set -g status-keys vi
 set -g history-limit 10000
 set -g escape-time 0
-
+set -g repeat-time 1000
 setw -g mouse off
 
 bind-key v split-window -h
@@ -47,6 +47,4 @@ bind -n M-Down select-pane -D
 bind -n S-Left  previous-window
 bind -n S-Right next-window
 
-set -g repeat-time 1000
-
 bind r source-file ~/.tmux.conf \; display "Reloading config..."
diff --git a/zshrc b/zshrc
index 9b31c18..2ab2274 100644
--- a/zshrc
+++ b/zshrc
@@ -108,9 +108,6 @@ bindkey -v
 export PATH=$HOME/local/bin:$PATH
 export PATH=$HOME/bin:$PATH
 
-# General environment
-export EDITOR=vim
-
 # set up asdf (must be after paths)
 . $HOME/.asdf/asdf.sh
 
@@ -120,6 +117,16 @@ git config --global alias.ci commit
 git config --global alias.st status
 git config --global alias.br branch
 
+# Other aliases
+
+# recursive grep with line numbers and colour, ignoring binary files:
+alias gnr="grep -nR -I --color"
+# same but case-insensitive:
+alias gnri="grep -nRi -I --color"
+
+# Postgres default user:
+export PGUSER=postgres
+
 # On boot, power on bluetooth and start xfce
 if [ $(tty) = "/dev/tty1" ]; then
   bluetoothctl power on