X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/9daac2399f744608b95f1c0a99b02f30f32a7be5..b188e798a0a4f0ec375f63e34fe26c76872e9acf:/.profile?ds=inline diff --git a/.profile b/.profile index 10425ee..883d1a7 100644 --- a/.profile +++ b/.profile @@ -1,23 +1,25 @@ # ~/.profile: executed by the command interpreter for login shells. # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login # exists. -# see /usr/share/doc/bash/examples/startup-files for examples. -# the files are located in the bash-doc package. -# the default umask is set in /etc/profile; for setting the umask -# for ssh logins, install and configure the libpam-umask package. -#umask 022 +# 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/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH" +if [ -z "$IS_GUIX_SYSTEM" ]; then + PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH" + export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" +fi export PATH export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" -export XDG_DATA_DIRS="/usr/share/mate:/usr/local/share/:/usr/share/" export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc @@ -35,17 +37,44 @@ if [ -n "$BASH_VERSION" ]; then fi fi -# if guix is installed -if [ -x "$(command -v guix)" ]; then - export PATH="$HOME/.config/guix/current/bin:$PATH" - export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" +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 - GUIX_PROFILE="$HOME/.guix-profile" - . "$GUIX_PROFILE/etc/profile" +# 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_ab,ir \ + -layout us,ir \ -option ctrl:nocaps \ - -option altwin:swap_alt_win \ -option grp:shifts_toggle + +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