bunch of updates and fixes

[distro-setup] / filesystem / etc / profile.d / environment.sh

diff --git a/filesystem/etc/profile.d/environment.sh b/filesystem/etc/profile.d/environment.sh
index 6a1dff0d6c2d8500f2f0c2d6bcdd27e0b885027c..96f0271c18aadc5a34f63460aab960f0d870948a 100644 (file)
--- a/filesystem/etc/profile.d/environment.sh
+++ b/filesystem/etc/profile.d/environment.sh
@@ -1,14 +1,23 @@
-if [ -f $HOME/path_add-function ]; then
-    . $HOME/path_add-function
-    path_add /usr/sbin /usr/local/sbin /sbin
-    path_add /a/exe /a/opt/bin $HOME/.cabal/bin
+if [ -f $HOME/path-add-function ]; then
+  . $HOME/path-add-function
+  path-add /usr/sbin /usr/local/sbin /sbin /a/exe /a/opt/bin
+  path-add --end $HOME/.cabal/bin
+
+  if [ -r /etc/alternatives/java_sdk ]; then
+    export JAVA_HOME=/etc/alternatives/java_sdk
+    path-add /etc/alternatives/java_sdk
+  fi
+
+  export GUIX_PROFILE=/root/.config/guix/current
+  if [[ -e $GUIX_PROFILE/etc/profile ]]; then
+    source $GUIX_PROFILE/etc/profile
+  fi
+  path-add $HOME/.guix-profile/bin
+  export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
 
-    if [ -r /etc/alternatives/java_sdk ]; then
-        export JAVA_HOME=/etc/alternatives/java_sdk
-        path_add /etc/alternatives/java_sdk
-    fi
 fi
 
+
 export EDITOR="emacsclient"
 # this makes emacsclient file/-c start a server instance if none is running,
 # instead of some alternate editor logic
@@ -40,26 +49,29 @@ export TZ=:/etc/localtime
 # I also added the bit about xmessaging the stderr,
 # because I'd like to know if the command fails
 if [ -f /etc/fedora-release ]; then
-    : ${GNUPGHOME=$HOME/.gnupg}
+  : ${GNUPGHOME=$HOME/.gnupg}
 
-    GPGAGENT=/usr/bin/gpg-agent
-    PID_FILE="$GNUPGHOME/gpg-agent-info-$(hostname)"
+  GPGAGENT=/usr/bin/gpg-agent
+  PID_FILE="$GNUPGHOME/gpg-agent-info-$(hostname)"
 
-    if ! $GPGAGENT 2>/dev/null; then
-        temp="$(mktemp)"
-        eval "$($GPGAGENT --homedir /p/do-not-delete --daemon --sh --write-env-file=$PID_FILE 2>$temp)"
-        temperr="$(<"$temp")"
-        [ -n "$temperr" ] && xmessage "gpg-agent stderr: $temperr"
-    elif [ -r "$PID_FILE" ]; then
-        . "$PID_FILE"
-        export GPG_AGENT_INFO
-    fi
+  if ! $GPGAGENT 2>/dev/null; then
+    temp="$(mktemp)"
+    eval "$($GPGAGENT --homedir /p/do-not-delete --daemon --sh --write-env-file=$PID_FILE 2>$temp)"
+    temperr="$(<"$temp")"
+    [ -n "$temperr" ] && xmessage "gpg-agent stderr: $temperr"
+  elif [ -r "$PID_FILE" ]; then
+    . "$PID_FILE"
+    export GPG_AGENT_INFO
+  fi
 fi
 
 # background:
 # ubuntu has 002 for non-system users, debian has 022.  002 makes groups
 # be rw instead of r.
 #
+# I think the actual setting is somewhere in the pam settings, I haven't
+# bothered to figure that out.
+#
 # ubuntu is more user friendly when using multiple users. However,
 # it also makes it so if you create a file as a regular user then move
 # it to become a system file, it's got slightly wrong permissions, and