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 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 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 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