X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bash_profile;h=a10989b0adce6a1219ef30f4717a1cfccf5f9c99;hb=5f8135d931908809a284f939f8e1a5a11b786a26;hp=c408f2d146db1de4a9dd6ba4cc36447cdf9cda5c;hpb=9079822dd2d96f14dcd4cc94cc42bf3c0179558a;p=max%2Fdotfiles.git

diff --git a/bash/.bash_profile b/bash/.bash_profile
index c408f2d..a10989b 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,6 +1,6 @@
-export EDITOR="emc"
-export PAGER="/usr/bin/less -R"
+export EDITOR="vim"
 export PATH="/home/max/.local/bin:${PATH}"
+export TMPDIR="/home/max/.local/tmp"
 
 if [ -n "$BASH_VERSION" ]; then
   # include .bashrc if it exists
@@ -13,7 +13,43 @@ if [ -f /etc/bash_completion ]; then
   . /etc/bash_completion
 fi
 
-export TMPDIR="/home/max/.local/tmp"
+export PATH="$HOME/.cargo/bin:$PATH"
+
+if test -z "${XDG_RUNTIME_DIR}"; then
+  export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
+  if ! test -d "${XDG_RUNTIME_DIR}"; then
+    mkdir "${XDG_RUNTIME_DIR}"
+    chmod 0700 "${XDG_RUNTIME_DIR}"
+  fi
+fi
 
-gpg-agent --daemon --enable-ssh-support \
-  --write-env-file "${HOME}/.gpg-agent-info"
+export QT_QPA_PLATFORM=wayland-egl
+
+if [ -f ~/.config/sway/config.base ]; then
+  cat ~/.config/sway/config.base ~/.config/sway/config.${HOSTNAME} > ~/.config/sway/config
+fi
+
+if [ -f ~/.Xresources ]; then
+  cat ~/.Xresources > ~/.Xdefaults
+  if [ -f ~/.Xresources.$HOSTNAME ]; then
+    cat ~/.Xresources.$HOSTNAME >> ~/.Xdefaults
+  fi
+fi
+
+if [ -f ~/.config/termite/config.base ]; then
+  cat ~/.config/termite/config.base ~/.config/termite/config.${HOSTNAME} > \
+	~/.config/termite/config
+fi
+
+
+if [ $HOSTNAME = "magnesium" ]; then
+  export XKB_DEFAULT_LAYOUT=us
+  export XKB_DEFAULT_VARIANT=colemak
+  export XKB_DEFAULT_OPTIONS=ctrl:nocaps
+fi
+
+if [ $HOSTNAME = "platinum" ]; then
+  export XKB_DEFAULT_LAYOUT=gb
+  export XKB_DEFAULT_VARIANT=colemak
+  export XKB_DEFAULT_OPTIONS=ctrl:nocaps
+fi