From 6cb71fa6cccea913e21b46af3d4f81b881d1d33d Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Thu, 22 Dec 2022 16:31:21 +0100
Subject: [PATCH 1/4] Source only readable profiles

Newer Ubuntu versions put files only readable by root into
/etc/profile.d
---
 .zshenv | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.zshenv b/.zshenv
index c4ab88d..311713c 100644
--- a/.zshenv
+++ b/.zshenv
@@ -251,6 +251,9 @@ if [ -d /etc/profile.d ]
 then
     for i in /etc/profile.d/*.sh
     do
-        . $i
+        if [ -r $i ]
+        then
+            . $i
+        fi
     done
 fi

From 0b316e008c975fb44e3a5a945c91f016feb69315 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Thu, 22 Dec 2022 16:34:02 +0100
Subject: [PATCH 2/4] Add collection of ssh public keys

---
 ssh-keys/arche-noah_2022.pub | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ssh-keys/arche-noah_2022.pub

diff --git a/ssh-keys/arche-noah_2022.pub b/ssh-keys/arche-noah_2022.pub
new file mode 100644
index 0000000..affb912
--- /dev/null
+++ b/ssh-keys/arche-noah_2022.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4jRA8UfI8UNzbxFq1xnRxm1oKzs39pDpB7ox5gBXvC hjp@arche-noah

From 1db95b29967144f2c6e244936e967539eabf65c4 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@hjp.at>
Date: Sat, 4 Mar 2023 10:22:35 +0100
Subject: [PATCH 3/4] Set pull.rebase to false globally (finally!)

---
 .gitconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index c910008..277a489 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,3 +15,10 @@
         # nothing is inconvenient, matching is dangerous. 
         # current is only compatible remaining option.
 	default = current
+[color "diff"]
+        # Display commit ids blue on white.
+        # Default is yellow on normal which is unreadable with a light
+        # background
+	commit = blue white
+[pull]
+	rebase = false

From 9db6a30e4a8a5cf5de00ca3e5056b0c32b9cdcf2 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@hjp.at>
Date: Thu, 3 Aug 2023 21:32:09 +0200
Subject: [PATCH 4/4] Remove alias j (jobs) to avoid clash with autojump

---
 .zshrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.zshrc b/.zshrc
index f6127ea..2b1e2b1 100644
--- a/.zshrc
+++ b/.zshrc
@@ -6,7 +6,6 @@ REPORTTIME=2
 alias	amke=make
 alias	a=alias
 alias	h=history
-alias	j=jobs
 alias	v=vi
 alias	lo=logout
 alias	md=mkdir