X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bash_profile;h=31f6bb55685d37d85ae191b2e3c89706bedcf8a7;hb=af350005c4b952803f558a22ef9ed82648c4cc45;hp=c4958eba66df8a0efa9538ffa4eadba04ba02ddd;hpb=8cd8d91a7f2698b675d486a127481a20db58ce41;p=max%2Fdotfiles.git

diff --git a/bash/.bash_profile b/bash/.bash_profile
index c4958eb..31f6bb5 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,11 +1,6 @@
-export NPM_PACKAGES="$HOME/.npm-packages"
-export EDITOR="/usr/bin/vim"
-export PAGER="/usr/bin/less"
-export PATH="/home/max/.local/bin:$NPM_PACKAGES/bin:$HOME/.gem/ruby/2.1.0/bin/:$HOME/.rvm/bin:${PATH}"
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-unset MANPATH
-MANPATH="$NPM_PACKAGES/share/man:$(manpath)"
-NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
+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
@@ -18,13 +13,32 @@ if [ -f /etc/bash_completion ]; then
   . /etc/bash_completion
 fi
 
-envfile="$HOME/.gnupg/gpg-agent.env"
-if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then
-  eval "$(cat "$envfile")"
-else
-  eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")"
+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
-export GPG_AGENT_INFO  # the env file does not contain the export statement
-export SSH_AUTH_SOCK   # enable gpg-agent for ssh
 
-export TMPDIR="/home/max/.local/tmp"
+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 [ $HOSTNAME = "magnesium" ]; then
+  export XKB_DEFAULT_LAYOUT=us
+  export XKB_DEFAULT_VARIANT=colemak
+  export XKB_DEFAULT_OPTIONS=caps:ctrl_modifier
+fi