shell: a bunch of uncommitted changes since i switched to Trisquel

[~bandali/configs] / .profile

diff --git a/.profile b/.profile
index 50cf3db..10425ee 100644 (file)
--- a/.profile
+++ b/.profile
@@ -1,25 +1,51 @@
-export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
-export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc
+# ~/.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"
 
-export PATH="$HOME/.local/bin:$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin${PATH:+:}$PATH"
-export GOPATH="$HOME/src/go"
+PATH="$HOME/bin:$HOME/.local/bin:$PATH"
+PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH"
+export PATH
 
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_DATA_DIRS="/usr/local/share:/usr/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
 
 export MAILDIR="$HOME/mail"
 export CVS_RSH="ssh"
 
+export GOPATH="$HOME/src/go"
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+       . "$HOME/.bashrc"
+    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"
-    export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
-    export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
-    export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
-    export GIT_SSL_CAINFO="$SSL_CERT_FILE"
+
+    GUIX_PROFILE="$HOME/.guix-profile"
+    . "$GUIX_PROFILE/etc/profile"
 fi
 
-export NIXPKGS="$HOME/src/git/nixpkgs"
+setxkbmap \
+    -layout us_ab,ir \
+    -option ctrl:nocaps \
+    -option altwin:swap_alt_win \
+    -option grp:shifts_toggle