Merge branch 'master' of git.hjp.at:hjp/dot

.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

.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

.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

ssh-keys/arche-noah_2022.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4jRA8UfI8UNzbxFq1xnRxm1oKzs39pDpB7ox5gBXvC hjp@arche-noah