Merge branch 'master' of tardis:/dotfiles

diff --git a/Makefile b/Makefile
index 3c9162d2723f547cd2fba89e5382fa8346368d5c..9c266c3f77c17e1aa568051898dd7b8f131911d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 APATH := $(realpath .)
 
 FILES := bin
-DOTFILES := conky* git* goobookrc msmtp* mutt ncmpcpp profile weechat xbindkeysrc Xresources xprofile zprofile zshenv zshrc
-CONFIGFILES := aliases compton.conf git mimeo.conf mpd mpv offlineimap ranger retroarch systemd vim xkb zsh
+DOTFILES := conky* git* goobookrc msmtp* mutt ncmpcpp profile weechat Xresources xprofile zprofile zshenv zshrc
+CONFIGFILES := aliases compton.conf git mimeo.conf mpd mpv offlineimap ranger retroarch systemd vim xbindkeys xkb zsh
 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)

diff --git a/ncmpcpp/bindings b/ncmpcpp/bindings
index 14878a769a29618f1979f34e752fb362e76195b2..83ae3d5ebb23df66a6e3259385fc99b4c64cc8ec 100644 (file)
--- a/ncmpcpp/bindings
+++ b/ncmpcpp/bindings
@@ -73,3 +73,15 @@ def_key "&"
 
 def_key "*"
   show_visualizer
+
+def_key "c"
+  clear_main_playlist
+
+# def_key "c"
+#   dummy
+
+def_key "C"
+  crop_main_playlist
+
+# def_key "C"
+#   dummy

diff --git a/xbindkeysrc b/xbindkeys/chronos
similarity index 86%
rename from xbindkeysrc
rename to xbindkeys/chronos
index 81c5618cb514e927abb01bc038022c77e34a5c21..73692015da90b95c20f36c4de4b86cd29e86eb6f 100644 (file)
--- a/xbindkeysrc
+++ b/xbindkeys/chronos
@@ -27,12 +27,6 @@
 #keystate_capslock = enable
 #keystate_scrolllock= enable
 
-"qdbus --literal org.kde.kglobalaccel /component/kwin invokeShortcut Expose"
- b:10
-
-"qdbus --literal org.kde.kglobalaccel /component/kwin invokeShortcut ShowDesktopGrid"
- b:13
-
 "asus-kbd-backlight up"
  XF86KbdBrightnessUp
 

diff --git a/xprofile b/xprofile
index eedbcc45ab92d5daecd865507561015ad83d44db..fef5b6d6f28e1d6088daf48fe6ff1904d55bd577 100644 (file)
--- a/xprofile
+++ b/xprofile
@@ -6,6 +6,6 @@ xautolock -detectsleep \
           -killtime 70 -killer   "systemctl suspend" &
 xkbcomp -I$HOME/.config/xkb $HOME/.config/xkb/$(hostname).xkb $DISPLAY
 unclutter -idle 1 -root &
-[[ -x /usr/bin/xbindkeys ]] && xbindkeys
+[[ -x "$XDG_CONFIG_HOME/xbindkeys/$(hostname)" ]] && xbindkeys --file $XDG_CONFIG_HOME/xbindkeys/$(hostname)
 xcape -e "Control_L=Escape;Control_R=Escape"
 urxvtd -q -f -o

diff --git a/zsh/lib/title.zsh b/zsh/lib/title.zsh
index 18fe7e2e0041f1cceaf064c966596fc2d26c613f..c58da48aad6770612534146df2774b06a785d80a 100644 (file)
--- a/zsh/lib/title.zsh
+++ b/zsh/lib/title.zsh
@@ -1,3 +1,7 @@
+if [[ "$TERM" == "linux" ]]; then
+    return
+fi
+
 function title {
   local tmp
   tmp=(${(f)*})