Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --git a/bash/.bash_profile b/bash/.bash_profile
index a10989b0adce6a1219ef30f4717a1cfccf5f9c99..da0b8fbf838a73d54b5f9c5676fba1600fba4eeb 100644 (file)
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,55 +1,10 @@
-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
-  if [ -f "$HOME/.bashrc" ]; then
-    . "$HOME/.bashrc"
-  fi
-fi
-
-if [ -f /etc/bash_completion ]; then
-  . /etc/bash_completion
-fi
-
-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 QT_QPA_PLATFORM=wayland-egl
-
-if [ -f ~/.config/sway/config.base ]; then
-  cat ~/.config/sway/config.base ~/.config/sway/config.${HOSTNAME} > ~/.config/sway/config
+if [ -r ~/.profile ]; then
+       . ~/.profile;
 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
+case "$-" in *i*)
+       if [ -r ~/.bashrc ]; then 
+               . ~/.bashrc
+       fi
+       ;; 
+esac

diff --git a/bash/.bashrc b/bash/.bashrc
index d9e59b2c92964b995e9d22e2d1b041d7b41a2d9f..262240a26400d19c04c15eae12d879cfdff5742d 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -2,12 +2,6 @@
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
 # for examples
 
-# If not running interactively, don't do anything
-case $- in
-  *i*) ;;
-  *) return;;
-esac
-
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
 HISTCONTROL=ignoreboth
@@ -17,34 +11,16 @@ shopt -s histappend
 
 # for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
 HISTSIZE=1000
-HISTFILESIZE=2000
+HISTFILESIZE=20000
 
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
-# make less more friendly for non-text input files, see lesspipe(1)
-if [ -x /usr/bin/lesspipe ]; then 
-  export LESSOPEN="|lesspipe %s"
-elif [ -x /usr/bin/lesspipe.sh ]; then 
-  export LESSOPEN="|lesspipe %s"
-fi
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-  debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-
-# colored GCC warnings and errors
-export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-
 if [ -f ~/.bash_aliases ]; then
   . ~/.bash_aliases
 fi
 
-eval `dircolors ~/.dir_colors`
 
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
@@ -136,3 +112,7 @@ fi
 
 export GPG_TTY=($tty)
 gpg-connect-agent updatestartuptty /bye > /dev/null
+
+export EDITOR="vim"
+export TMPDIR="/home/max/.local/tmp"
+eval `dircolors ~/.dir_colors`

diff --git a/bash/.profile b/bash/.profile
new file mode 100644 (file)
index 0000000..ac900b6
--- /dev/null
+++ b/bash/.profile
@@ -0,0 +1,52 @@
+export PATH="${HOME}/.local/bin:${HOME}/.cargo/bin:${PATH}"
+
+# Make XDG_RUNTIME_DIR, required for some sessions
+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 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
+
+# make less more friendly for non-text input files, see lesspipe(1)
+if [ -x /usr/bin/lesspipe ]; then 
+  export LESSOPEN="|lesspipe %s"
+elif [ -x /usr/bin/lesspipe.sh ]; then 
+  export LESSOPEN="|lesspipe %s"
+fi
+
+# colored GCC warnings and errors
+export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+

diff --git a/sway/.config/sway/config.magnesium b/sway/.config/sway/config.magnesium
index 6f57de592394a3fdda9263ac23c8ca4918dc415a..3abeacb0611d92eb03358ae4ba8e86cbf740dc47 100644 (file)
--- a/sway/.config/sway/config.magnesium
+++ b/sway/.config/sway/config.magnesium
@@ -37,14 +37,17 @@ workspace 2 output HDMI-A-3
 
 output HDMI-A-2 {
   position 0 0
-  background ~/Pictures/background1.png fit
+  background ~/Pictures/background_1080_1.png fit
 }
 
 output HDMI-A-3 {
   position 1920 0
-  background ~/Pictures/background2.png fit
+  background ~/Pictures/background_1080_2.png fit
 }
 
 
 
 font pango:Liberation Mono 8
+
+exec xhost +si:localuser:spotify
+exec no_glock +si:localuser:spotify

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index a16b2beed6953652b17c66a29ed19f93845bf59c..82d3cce018c86f927c96507d46f041fc75843390 100644 (file)
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -61,42 +61,28 @@ set-option -g bell-action none
 
 #  modes
 setw -g clock-mode-colour colour5
-setw -g mode-attr bold
-setw -g mode-fg colour7
-setw -g mode-bg colour8
+setw -g mode-style bold,fg=colour7,bg=colour8
 
 # panes
-set -g pane-border-bg colour8
-set -g pane-border-fg colour0
-set -g pane-active-border-bg colour0
-set -g pane-active-border-fg colour7
+set -g pane-border-style bg=colour8,fg=colour0
+set -g pane-active-border-style bg=colour0,fg=colour7
 
 # statusbar
 set -g status-position bottom
 set -g status-justify left
-set -g status-bg colour0
-set -g status-fg colour137
-set -g status-attr dim
+set -g status-style bg=colour0,fg=colour137,dim
 set -g status-left ''
 set -g status-right '#[fg=colour233,bg=colour8,bold] %d/%m #[fg=colour233,bg=colour7,bold] %H:%M:%S '
 set -g status-right-length 50
 set -g status-left-length 20
 
-setw -g window-status-current-fg colour3
-setw -g window-status-current-bg colour8
-setw -g window-status-current-attr bold
+setw -g window-status-current-style fg=colour3,bg=colour8,bold
 setw -g window-status-current-format ' #I#[fg=colour3]:#[fg=colour7]#W#[fg=colour249]#F '
 
-setw -g window-status-fg colour8
-setw -g window-status-bg colour7
-setw -g window-status-attr none
+setw -g window-status-style fg=colour8,bg=colour7,none
 setw -g window-status-format ' #I#[fg=colour8]:#[fg=colour8]#W#[fg=colour8]#F '
 
-setw -g window-status-bell-attr bold
-setw -g window-status-bell-fg colour255
-setw -g window-status-bell-bg colour1
+setw -g window-status-bell-style fg=colour255,bg=colour1,bold
 
 # messages
-set -g message-attr bold
-set -g message-fg colour3
-set -g message-bg colour0
+set -g message-style fg=colour3,bg=colour0,bold