emacs: update custom-file

[~bandali/configs] / .profile

diff --git a/.profile b/.profile
index 89951ab..883d1a7 100644 (file)
--- a/.profile
+++ b/.profile
@@ -13,7 +13,8 @@ export VISUAL="emcl"
 PATH="$HOME/bin:$HOME/.local/bin:$PATH"
 PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH"
 if [ -z "$IS_GUIX_SYSTEM" ]; then
 PATH="$HOME/bin:$HOME/.local/bin:$PATH"
 PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH"
 if [ -z "$IS_GUIX_SYSTEM" ]; then

-    PATH="$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$PATH"
+    PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
+    export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale"

 fi
 export PATH
 
 fi
 export PATH
 


@@ -39,13 +40,28 @@ fi
 if [ -z "$IS_GUIX_SYSTEM" ]; then
     # if guix is installed
     if [ -x "$(command -v guix)" ]; then
 if [ -z "$IS_GUIX_SYSTEM" ]; then
     # if guix is installed
     if [ -x "$(command -v guix)" ]; then

-        export GIT_EXEC_PATH="$HOME/.guix-profile/libexec/git-core"
-        export PASSWORD_STORE_SYSTEM_EXTENSION_DIR="$HOME/.guix-profile/lib/password-store/extensions${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:+:}$PASSWORD_STORE_SYSTEM_EXTENSION_DIR"
+        SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
+        if [ -d "$SSL_CERT_DIR" -o -h "$SSL_CERT_DIR" ]; then
+            export SSL_CERT_DIR
+            export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
+        else
+            printf "it seems you forgot to \`guix install nss-certs\'\n"
+        fi

         GUIX_PROFILE="$HOME/.guix-profile"
         . "$GUIX_PROFILE/etc/profile"
     fi
 fi
 
         GUIX_PROFILE="$HOME/.guix-profile"
         . "$GUIX_PROFILE/etc/profile"
     fi
 fi
 

+# start an ssh-agent (with guix's openssh)
+if [ -z "$IS_GUIX_SYSTEM" ]; then
+    if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+        ssh-agent > ~/.ssh-agent-thing
+    fi
+    if [[ ! "$SSH_AUTH_SOCK" ]]; then
+        eval "$(<~/.ssh-agent-thing)"
+    fi
+fi
+

 setxkbmap \
     -layout us,ir \
     -option ctrl:nocaps \
 setxkbmap \
     -layout us,ir \
     -option ctrl:nocaps \


@@ -54,3 +70,11 @@ setxkbmap \
 xmodmap -e "keysym Menu = Super_R"
 
 xrdb -merge "$HOME/.Xresources"
 xmodmap -e "keysym Menu = Super_R"
 
 xrdb -merge "$HOME/.Xresources"

+
+# footenote: when on a foreign distro and using Xfce, don't forget to
+# disable its auto-start of gpg- and ssh-agent, by issuing
+#     xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled -n -t bool -s false
+#     xfconf-query -c xfce4-session -p /startup/gpg-agent/enabled -n -t bool -s false
+# see https://docs.xfce.org/xfce/xfce4-session/advanced#ssh_and_gpg_agents
+# also, MATE does something similar with gnome-keyring-daemon:
+# http://william.shallum.net/random-notes/disabling-gnome-keyring-daemon-ssh-agent-on-mate-desktop