dotfiles

commit 6b05bcf3dde6ebcaefcb3c12999b0f9e2af9ed2a
parent 4d3623db4bf1984829565e5b6723930e9adebeee
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Sat,  5 Oct 2019 10:36:44 +0200

Fix invocation of environment

Diffstat:
M
.kshrc
 | 
6
++++++
M
.profile
 | 
6
------
M
.xprofile
 | 
3
+++

3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.kshrc b/.kshrc
@@ -2,3 +2,9 @@ HISTFILE="$HOME/.ksh_history"
 HISTSIZE=50000
 
 set -o vi
+
+[ -f $HOME/.config/sh/commands ] && . $HOME/.config/sh/commands
+
+HOSTNAME=${HOSTNAME:-$(uname -n)}
+HOST=${HOSTNAME%%.*}
+export PS1="\$(id -un)@${HOST} \$( echo \$PWD | sed 's|$HOME|~|') \$( if [ \$(id -u) -gt 0 ]; then print \$; else print \#; fi) "
diff --git a/.profile b/.profile
@@ -1,12 +1,6 @@
-# sh/ksh initialization
-
 PATH=$HOME/.local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin:/usr/games
 export PATH HOME TERM ENV
 
 [ -f $HOME/.config/sh/profile ] && . $HOME/.config/sh/profile
-[ -f $HOME/.config/sh/commands ] && . $HOME/.config/sh/commands
 
-HOSTNAME=${HOSTNAME:-$(uname -n)}
-HOST=${HOSTNAME%%.*}
-export PS1="\$(id -un)@${HOST} \$( echo \$PWD | sed 's|$HOME|~|') \$( if [ \$(id -u) -gt 0 ]; then print \$; else print \#; fi) "
 export ENV=$HOME/.kshrc
diff --git a/.xprofile b/.xprofile
@@ -17,6 +17,9 @@ xset dpms 300 600 900  # standby -> suspend -> off (seconds)
 [ ! "$(uname)" = "OpenBSD" ] && xset m 1/4 0
 xset r rate 300 50     # key repeat rate ([delay in ms] [repeats per sec])
 
+[ -f $HOME/.config/sh/profile ] && . $HOME/.config/sh/profile
+export ENV=$HOME/.kshrc
+
 # auto-start programs
 dunst &
 dwmstatus &