bash: adapt config for guix system

1 files changed, 9 insertions, 12 deletions

diff --git a/.profile b/.profile
index 10425ee..bed8ade 100644
--- a/.profile
+++ b/.profile
@@ -1,23 +1,17 @@
 # ~/.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
 
 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"
 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
@@ -27,6 +21,9 @@ 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
@@ -37,15 +34,15 @@ 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"
 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"