X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/48a6257474f5fb7daff47b7bc0664c76fae50e13..3457307b74d15e7ced6ff00e1ae91166d2537cdb:/.profile diff --git a/.profile b/.profile index 8b7956f..c812eb9 100644 --- a/.profile +++ b/.profile @@ -10,13 +10,15 @@ fi export EDITOR="emacsclient -nw" export VISUAL="emcl" -PATH="$HOME/bin:$HOME/.local/bin:$PATH" +PATH="$HOME/usr/local/bin:$HOME/.local/bin:$PATH" PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH" if [ -z "$IS_GUIX_SYSTEM" ]; then PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH" + INFOPATH="$HOME/.config/guix/current/share/info${INFOPATH:+:}$INFOPATH" export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" fi export PATH +export INFOPATH export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" @@ -40,13 +42,28 @@ fi if [ -z "$IS_GUIX_SYSTEM" ]; then # if guix is installed if [ -x "$(command -v guix)" ]; then - export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs" - export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt" + 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 +# 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 \ @@ -55,3 +72,11 @@ setxkbmap \ 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