shell: more flexible per-host profile configuration

[~bandali/configs] / .profile

diff --git a/.profile b/.profile
index 10425ee..89951ab 100644 (file)
--- a/.profile
+++ b/.profile
@@ -1,23 +1,24 @@
 # ~/.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/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$PATH"
+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 +36,21 @@ 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"
-
-    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
+        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_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"