Merge branch 'master' of tardis:/dotfiles

diff --git a/aliases b/aliases
index 821dd105e53ab5d8c2b6f08ccc9104ece1775d69..00f1f2e2b1fb636e48b71055a7ad11a47c79ff32 100644 (file)
--- a/aliases
+++ b/aliases
@@ -28,11 +28,6 @@ export LESS='-Ri'
 # yes I'm that lazy
 alias o='mimeo'
 
-#systemd aliases
-alias sctl='systemctl'
-alias jctl='journalctl'
-#complete -F _systemctl sctl doesn't work with new bash-completion
-
 # suspend screensaver when vlc is running
 alias vlc-suspend='xdg-screensaver suspend $(xprop -name vlc | grep "WM_CLIENT_LEADER(WINDOW)" | sed "s/.*\(0x\d*\)/\1/")'
 

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 1bf335e48c47df1833c73e6e636dd42dd5256db8..9d8a7d38bd3aed9726e9bee9f2858dc5616eb123 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -7,6 +7,7 @@ beautiful = require("beautiful")
 naughty = require("naughty")
 menubar = require("menubar")
 lain = require("lain")
+require("awful.remote")
 
 -- Error handling {{{1
 -- Check if awesome encountered an error during startup and fell back to

diff --git a/dwb/forms b/dwb/forms
index acec7702919359be825f842e2e6f4c4f389d38e5..71841a51f896b6385d3a825e00ab70bf54544a66 100644 (file)
Binary files a/dwb/forms and b/dwb/forms differ

diff --git a/mpd/mpd.conf b/mpd/mpd.conf
index 38f2a3d5095399457ff9a8674eb72c1efc78bde4..fa0126b18e50af6976d784ef220204e0c74e1b43 100644 (file)
--- a/mpd/mpd.conf
+++ b/mpd/mpd.conf
@@ -1,6 +1,8 @@
 # An example configuration file for MPD can be found at:
 # /usr/share/doc/mpd/
 
+bind_to_address     "localhost"
+bind_to_address     "/var/run/user/1000/mpd.socket"
 music_directory     "~/music"
 playlist_directory  "~/.local/share/mpd/playlists"
 db_file             "~/.local/share/mpd/database"

diff --git a/zsh/aliases/systemd.zsh b/zsh/aliases/systemd.zsh
index 802c61c3801977223993f4952a7480c73c9d4481..56ce5d6d234cd1cfd9558938d647a738197b9927 100644 (file)
--- a/zsh/aliases/systemd.zsh
+++ b/zsh/aliases/systemd.zsh
@@ -1,6 +1,6 @@
+# system sessions
 alias sc='systemctl'
 
-# system sessions
 alias sc-status='systemctl status'
 alias sc-list-units='systemctl list-units'
 alias sc-list-unit-files='systemctl list-unit-files'

diff --git a/zsh/lib/title.zsh b/zsh/lib/title.zsh
index 09c59475b25e6abd6513d2c9ad31765c2c25e10d..18fe7e2e0041f1cceaf064c966596fc2d26c613f 100644 (file)
--- a/zsh/lib/title.zsh
+++ b/zsh/lib/title.zsh
@@ -9,6 +9,10 @@ case "$TERM" in
     function title_precmd  { title "${(%):-[%n@%m] %~}" }
     function title_preexec { title "$1" }
   ;;
+  (*)
+    function title_precmd  {}
+    function title_preexec {}
+  ;;
 esac
 
 autoload -U add-zsh-hook