diff options
| author | Amin Bandali <bandali@gnu.org> | 2019-08-05 13:40:21 -0400 |
|---|---|---|
| committer | Amin Bandali <bandali@gnu.org> | 2019-08-05 13:40:21 -0400 |
| commit | 47d195d98de6df54558a7764c54b7cb871cb9c84 (patch) | |
| tree | cd3f1c9d3a21e9eb7534d80bec8ccbe383580638 | |
| parent | 3487f1addf39e4f7f29fc9280652f88f8c684672 (diff) | |
| download | configs-47d195d98de6df54558a7764c54b7cb871cb9c84.tar.gz configs-47d195d98de6df54558a7764c54b7cb871cb9c84.tar.xz configs-47d195d98de6df54558a7764c54b7cb871cb9c84.zip | |
shell: more flexible per-host profile configuration
| -rw-r--r-- | .bashrc | 16 | ||||
| -rw-r--r-- | .config/profiles/chaman | 1 | ||||
| -rw-r--r-- | .config/profiles/langa | 1 | ||||
| -rw-r--r-- | .profile | 18 |
4 files changed, 27 insertions, 9 deletions
@@ -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/" @@ -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 \ |