Merge branch 'master' of https://git.frqrec.com/git/dot

* 'master' of https://git.frqrec.com/git/dot:
  .dircolors: Added .dircolors for colorful ls output in Termite.
  stop_jack: Added enabling of pulseaudio after disabling of JACK.
  start_jack: Added disabling of pulseaudio before starting jack, as it breaks system audio when using USB-MIDI interfaces.
  export.zsh: Unified settings for TERM and LC_TIME for some machines.
  .zprofile: Removed unnessecary exports. Added eval of dircolors (needed for Termite ls output).
  .tmux.conf: Setting allow rename to true
  .Xresources: Adding new font (Monospace) as default. Setting borderLess to true.

7 files changed, 240 insertions, 61 deletions

diff --git a/.Xresources b/.Xresources
index 71b2741..313d17b 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,5 +1,3 @@
-! .Xresources - konni 2012-11-30
-!!=====================================================================
 !! * uses rxvt-unicode
 !! * themed for solarized
 !! * includes font settings for powerline
@@ -54,31 +52,17 @@ Xft.lcdfilter                 : lcddefault
 !! ---------------------------------------------------------------------
 
 !! URxvt FONT ----------------------------------------------------------
-! Anonymous Pro - very small dots
-URxvt*font                    : xft:Anonymous Pro for Powerline:regular:size=9
-URxvt*imFont                  : xft:Anonymous Pro for Powerline:regular:size=9
-URxvt*boldFont                : xft:Anonymous Pro for Powerline:bold:size=9
-URxvt*italicFont              : xft:Anonymous Pro for Powerline:italic:size=9
-URxvt*boldItalicFont          : xft:Anonymous Pro for Powerline:bold:italic:size=9
-
-!!  Inconsolata
-!URxvt*font                   : xft:Inconsolata for Powerline:regular:size=12
-!URxvt*imFont                 : xft:Inconsolata for Powerline:regular:size=12
-!URxvt*boldFont               : xft:Inconsolata for Powerline:bold:size=12
-!URxvt*italicFont             : xft:Inconsolata for Powerline:italic:size=12
-!URxvt*boldItalicFont         : xft:Inconsolata for Powerline:bold:italic:size=12
-
-!! Monaco
-!URxvt*font                   : xft:Monaco for Powerline:regular:size=9
-!URxvt*imFont                 : xft:Monaco for Powerline:regular:size=9
-!URxvt*boldFont               : xft:Monaco for Powerline:bold:size=9
-!URxvt*italicFont             : xft:Monaco for Powerline:italic:size=9
-!URxvt*boldItalicFont         : xft:Monaco for Powerline:bold:italic:size=9
+!! Monospace
+URxvt*font                   : xft:Monaco for Monospace:regular:size=9
+URxvt*imFont                 : xft:Monaco for Monospace:regular:size=9
+URxvt*boldFont               : xft:Monaco for Monospace:bold:size=9
+URxvt*italicFont             : xft:Monaco for Monospace:italic:size=9
+URxvt*boldItalicFont         : xft:Monaco for Monospace:bold:italic:size=9
 
 !! URxvt COLORS---------------------------------------------------------
 URxvt*depth                   : 32
 URxvt.foreground              : #a4b6bd
-!URxvt*background              : rgba:0000/0000/0000/bbbb
+URxvt*background              : rgba:0000/0000/0000/bbbb
 URxvt*background              : [95]#000000
 URxvt.fading                  : 15
 URxvt.fadeColor               : #121212
@@ -106,6 +90,7 @@ URxvt.pointerColorBackground  : #586e75
 URxvt.pointerColorForeground  : #93a1a1
 URxvt.pointerBlank            : false
 !! ---------------------------------------------------------------------
+URxvt.borderLess: true
 
 !! ICON -----------------------------------------------------------------
 URxvt.iconFile:    /usr/share/icons/HighContrast/scalable/apps/utilities-terminal.svg
diff --git a/.dircolors b/.dircolors
new file mode 100644
index 0000000..2e95ad9
--- /dev/null
+++ b/.dircolors
@@ -0,0 +1,218 @@
+# Configuration file for dircolors, a utility to help you set the
+# LS_COLORS environment variable used by GNU ls with the --color option.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copying and distribution of this file, with or without modification,
+# are permitted provided the copyright notice and this notice are preserved.
+# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
+# slackware version of dircolors) are recognized but ignored.
+# Below, there should be one TERM entry for each termtype that is colorizable
+TERM Eterm
+TERM ansi
+TERM color-xterm
+TERM con132x25
+TERM con132x30
+TERM con132x43
+TERM con132x60
+TERM con80x25
+TERM con80x28
+TERM con80x30
+TERM con80x43
+TERM con80x50
+TERM con80x60
+TERM cons25
+TERM console
+TERM cygwin
+TERM dtterm
+TERM eterm-color
+TERM gnome
+TERM gnome-256color
+TERM hurd
+TERM jfbterm
+TERM konsole
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM mach-gnu-color
+TERM mlterm
+TERM putty
+TERM putty-256color
+TERM rxvt
+TERM rxvt-256color
+TERM rxvt-cygwin
+TERM rxvt-cygwin-native
+TERM rxvt-unicode
+TERM rxvt-unicode-256color
+TERM rxvt-unicode256
+TERM screen
+TERM screen-256color
+TERM screen-256color-bce
+TERM screen-bce
+TERM screen-w
+TERM screen.Eterm
+TERM screen.rxvt
+TERM screen.linux
+TERM st
+TERM st-256color
+TERM terminator
+TERM vt100
+TERM xterm
+TERM xterm-16color
+TERM xterm-256color
+TERM xterm-88color
+TERM xterm-color
+TERM xterm-debian
+TERM xterm-termite
+# Below are the color init strings for the basic file types. A color init
+# string consists of one or more of the following numeric codes:
+# Attribute codes:
+# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
+# Text color codes:
+# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
+# Background color codes:
+# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
+#NORMAL 00 # no color code at all
+#FILE 00 # regular file: use no color at all
+RESET 0 # reset to "normal" color
+DIR 01;34 # directory
+LINK 01;36 # symbolic link. (If you set this to 'target' instead of a
+ # numerical value, the color is as for the file pointed to.)
+MULTIHARDLINK 00 # regular file with more than one link
+FIFO 40;33 # pipe
+SOCK 01;35 # socket
+DOOR 01;35 # door
+BLK 40;33;01 # block device driver
+CHR 40;33;01 # character device driver
+ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file
+SETUID 37;41 # file that is setuid (u+s)
+SETGID 30;43 # file that is setgid (g+s)
+CAPABILITY 30;41 # file with capability
+STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
+OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
+# This is for files with execute permission:
+EXEC 01;32
+# List any file extensions like '.gz' or '.tar' that you would like ls
+# to colorize below. Put the extension, a space, and the color init string.
+# (and any comments you want to add after a '#')
+# If you use DOS-style suffixes, you may want to uncomment the following:
+#.cmd 01;32 # executables (bright green)
+#.exe 01;32
+#.com 01;32
+#.btm 01;32
+#.bat 01;32
+# Or if you want to colorize scripts even if they do not have the
+# executable bit actually set.
+#.sh 01;32
+#.csh 01;32
+ # archives or compressed (bright red)
+.tar 01;31
+.tgz 01;31
+.arc 01;31
+.arj 01;31
+.taz 01;31
+.lha 01;31
+.lz4 01;31
+.lzh 01;31
+.lzma 01;31
+.tlz 01;31
+.txz 01;31
+.tzo 01;31
+.t7z 01;31
+.zip 01;31
+.z 01;31
+.Z 01;31
+.dz 01;31
+.gz 01;31
+.lrz 01;31
+.lz 01;31
+.lzo 01;31
+.xz 01;31
+.bz2 01;31
+.bz 01;31
+.tbz 01;31
+.tbz2 01;31
+.tz 01;31
+.deb 01;31
+.rpm 01;31
+.jar 01;31
+.war 01;31
+.ear 01;31
+.sar 01;31
+.rar 01;31
+.alz 01;31
+.ace 01;31
+.zoo 01;31
+.cpio 01;31
+.7z 01;31
+.rz 01;31
+.cab 01;31
+# image formats
+.jpg 01;35
+.jpeg 01;35
+.gif 01;35
+.bmp 01;35
+.pbm 01;35
+.pgm 01;35
+.ppm 01;35
+.tga 01;35
+.xbm 01;35
+.xpm 01;35
+.tif 01;35
+.tiff 01;35
+.png 01;35
+.svg 01;35
+.svgz 01;35
+.mng 01;35
+.pcx 01;35
+.mov 01;35
+.mpg 01;35
+.mpeg 01;35
+.m2v 01;35
+.mkv 01;35
+.webm 01;35
+.ogm 01;35
+.mp4 01;35
+.m4v 01;35
+.mp4v 01;35
+.vob 01;35
+.qt 01;35
+.nuv 01;35
+.wmv 01;35
+.asf 01;35
+.rm 01;35
+.rmvb 01;35
+.flc 01;35
+.avi 01;35
+.fli 01;35
+.flv 01;35
+.gl 01;35
+.dl 01;35
+.xcf 01;35
+.xwd 01;35
+.yuv 01;35
+.cgm 01;35
+.emf 01;35
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axv 01;35
+.anx 01;35
+.ogv 01;35
+.ogx 01;35
+# audio formats
+.aac 00;36
+.au 00;36
+.flac 00;36
+.m4a 00;36
+.mid 00;36
+.midi 00;36
+.mka 00;36
+.mp3 00;36
+.mpc 00;36
+.ogg 00;36
+.ra 00;36
+.wav 00;36
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axa 00;36
+.oga 00;36
+.spx 00;36
+.xspf 00;36
diff --git a/.tmux.conf b/.tmux.conf
index 586539c..98940f0 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -33,6 +33,7 @@ bind-key L resize-pane -R
 # setting titles on
 set -g set-titles on
 set -g set-titles-string "#T"
+set-option -g allow-rename on
 
 #set base-index 1
 set -g history-limit 10000
diff --git a/.zprofile b/.zprofile
index 7118770..45cdd5e 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,33 +1,5 @@
 #
 # Executes commands at login pre-zshrc.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-#
-# Browser
-#
-
-if [[ "$OSTYPE" == darwin* ]]; then
-  export BROWSER='open'
-fi
-
-#
-# Editors
-#
-
-export EDITOR='nano'
-export VISUAL='nano'
-export PAGER='less'
-
-#
-# Language
-#
-
-if [[ -z "$LANG" ]]; then
-  export LANG='en_US.UTF-8'
-fi
 
 #
 # Paths
@@ -75,3 +47,6 @@ if [[ ! -d "$TMPPREFIX" ]]; then
   mkdir -p "$TMPPREFIX"
 fi
 
+# dircolors
+# Set colors for ls output
+eval $(dircolors ~/.dircolors)
diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh
index ab087ae..e59bb3a 100644
--- a/.zsh.after/export.zsh
+++ b/.zsh.after/export.zsh
@@ -1,17 +1,12 @@
 # using termite now
 
 case "$(hostname)" in
-  "dvzrv")
-    export TERM=xterm-termite
-    export LC_TIME=de_DE.UTF-8
-    ;;
-  "frqrec")
-    #export TERM=xterm-256color
-    export TERM=rxvt-256color
+  "dvzrv"|"frqrec")
+    export TERM=xterm-256color
     export LC_TIME=de_DE.UTF-8
     ;;
   *)
-    export TERM=rxvt-256color
+    export TERM=xterm-256color
     ;;
 esac
 
diff --git a/bin/start_jack b/bin/start_jack
index 0c99aab..dfd6e4f 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -25,9 +25,11 @@ case "$HOSTNAME" in
     DEVICE="/dev/fw1"
     # TODO: Add settings from separate config file
     if [[ -e $DEVICE && -r $DEVICE && -w $DEVICE ]]; then
+      echo "Stopping pulseaudio"
+      systemctl --user stop pulse
       echo "Setting up "$DEVICE" with JACK."
       jack_control start
-      sudo schedtool -R -p 20 `pidof jackdbus`
+#      sudo /usr/bin/schedtool -R -p 20 `pidof jackdbus`
       jack_control eps realtime true
       jack_control ds firewire
       jack_control dps device $DEVICE
@@ -36,7 +38,7 @@ case "$HOSTNAME" in
       jack_control dps period 256
       sleep 3
       a2jmidid -e &
-      sudo schedtool -R -p 20 `pidof a2jmidid`
+#      sudo /usr/bin/schedtool -R -p 20 `pidof a2jmidid`
       rm ~/.config/SuperCollider/startup.scd
       ln -s ~/.config/SuperCollider/startupfiles/electronicStudio.scd ~/.config/SuperCollider/startup.scd -v
     else
diff --git a/bin/stop_jack b/bin/stop_jack
index 9c47548..786f16a 100755
--- a/bin/stop_jack
+++ b/bin/stop_jack
@@ -3,6 +3,9 @@
 jack_control stop
 sleep 3
 jack_control exit
+
+systemctl --user start pulse
+
 exit 0
 
 #kill $(pidof jackd)