From: Amin Bandali Date: Mon, 5 Aug 2019 17:40:21 +0000 (-0400) Subject: shell: more flexible per-host profile configuration X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/commitdiff_plain/47d195d98de6df54558a7764c54b7cb871cb9c84?ds=inline shell: more flexible per-host profile configuration --- diff --git a/.bashrc b/.bashrc index f93f6c9..e581cd3 100644 --- a/.bashrc +++ b/.bashrc @@ -69,13 +69,11 @@ aur() { cd ${1} } -# fzf -#include /usr/share/fzf/key-bindings.bash -#include /usr/share/fzf/completion.bash - -if ! pgrep -u "$USER" ssh-agent > /dev/null; then - ssh-agent > ~/.ssh-agent-thing -fi -if [[ ! "$SSH_AUTH_SOCK" ]]; then - eval "$(<~/.ssh-agent-thing)" +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 diff --git a/.config/profiles/chaman b/.config/profiles/chaman new file mode 100644 index 0000000..e8752b5 --- /dev/null +++ b/.config/profiles/chaman @@ -0,0 +1 @@ +IS_GUIX_SYSTEM=true diff --git a/.config/profiles/langa b/.config/profiles/langa new file mode 100644 index 0000000..764f785 --- /dev/null +++ b/.config/profiles/langa @@ -0,0 +1 @@ +export XDG_DATA_DIRS="/usr/share/mate:/usr/local/share/:/usr/share/" diff --git a/.profile b/.profile index bf2741c..89951ab 100644 --- a/.profile +++ b/.profile @@ -2,11 +2,19 @@ # 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/.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" +fi export PATH export XDG_CONFIG_HOME="$HOME/.config" @@ -28,6 +36,16 @@ if [ -n "$BASH_VERSION" ]; then fi fi +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" + GUIX_PROFILE="$HOME/.guix-profile" + . "$GUIX_PROFILE/etc/profile" + fi +fi + setxkbmap \ -layout us,ir \ -option ctrl:nocaps \