X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/a38abd4c8fb7572237b2681bb1d0d6b0e5b262b0..16ff2912b50296e533a40e149cad944bfaf30391:/.profile?ds=sidebyside diff --git a/.profile b/.profile index bed8ade..89951ab 100644 --- a/.profile +++ b/.profile @@ -2,12 +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" -PATH="$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$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" @@ -21,9 +28,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,10 +36,14 @@ 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 + 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 \