X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/a38abd4c8fb7572237b2681bb1d0d6b0e5b262b0..205cc04b34a14a117897fa49a2a760d644b9338e:/.profile?ds=inline diff --git a/.profile b/.profile index bed8ade..65221c4 100644 --- a/.profile +++ b/.profile @@ -2,13 +2,23 @@ # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login # exists. +# source host-specific profile +if [ -f "$HOME/.config/profiles/$(hostname)" ]; then + . "$HOME/.config/profiles/$(hostname)" +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" -PATH="$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$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" @@ -21,9 +31,6 @@ export CVS_RSH="ssh" export GOPATH="$HOME/src/go" -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" - # if running bash if [ -n "$BASH_VERSION" ]; then # include .bashrc if it exists @@ -32,17 +39,35 @@ if [ -n "$BASH_VERSION" ]; then fi fi -# if guix is installed -if [ -x "$(command -v guix)" ]; then - GUIX_PROFILE="$HOME/.guix-profile" - . "$GUIX_PROFILE/etc/profile" +if [ -z "$IS_GUIX_SYSTEM" ]; then + # if guix is installed + if [ -x "$(command -v guix)" ]; then + 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 -setxkbmap \ - -layout us,ir \ - -option ctrl:nocaps \ - -option grp:shifts_toggle - -xmodmap -e "keysym Menu = Super_R" +# 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 -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