From 5e5aa0b9f9b0b19472af001ea07d1c49b230dac6 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Fri, 19 Jun 2020 17:17:00 +0200
Subject: Add git pull configuration

---
 git/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'git/.gitconfig')

diff --git a/git/.gitconfig b/git/.gitconfig
index 0e7df50..738c719 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -19,3 +19,5 @@
 	default = simple
 [merge]
 	ff = true
+[pull]
+	rebase = false
-- 
cgit v1.2.3


From 60496da375fa7355a0f01d0e3dd6bf8afc46ffe5 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Fri, 2 Oct 2020 10:16:07 +0100
Subject: Do not sign by default

---
 git/.gitconfig  | 4 ++--
 tmux/.tmux.conf | 2 ++
 zsh/.zshenv     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'git/.gitconfig')

diff --git a/git/.gitconfig b/git/.gitconfig
index 0e7df50..1169c34 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -4,7 +4,7 @@
 [user]
 	name = Urbain Vaes
 	email = urbain@vaes.uk
-        signingKey = 716064C0
+        ; signingKey = 716064C0
 [init]
 	templatedir = ~/.git_template
 [alias]
@@ -13,7 +13,7 @@
 [http]
 	sslverify = false
 [commit]
-        gpgSign = true
+        ; gpgSign = true
         verbose = true
 [push]
 	default = simple
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index c16febc..6259e47 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -22,6 +22,8 @@ set -g pane-border-status off  # Alternative: top/bottom/...
 set -g pane-border-format "#{pane_current_command}"
 set -g status-justify centre  # Center window list
 set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'  # Get | cursor nvim insert
+set -sa terminal-overrides ',xterm*:RGB'
+set -sa terminal-overrides ',rxvt*:RGB'
 
 set-hook -g session-created "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set status-bg \"#aa4444\"' 'set status-bg \"green\"'"
 set-hook -g client-attached "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set status-bg \"#aa4444\"' 'set status-bg \"green\"'"
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 7917e82..7991bf1 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -16,5 +16,5 @@ fi
 [[ -f "$HOME/.pythonrc" ]] && export PYTHONSTARTUP="$HOME/.pythonrc"
 
 # Source guix profile
-guix_profile=$HOME/.guix-env
-[[ -f $guix_profile ]] && . $guix_profile
+# guix_profile=$HOME/.guix-env
+# [[ -f $guix_profile ]] && . $guix_profile
-- 
cgit v1.2.3