From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Fri, 30 Jan 2015 14:27:58 +0000 (+0000)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/1ea0168eaadac60df993d654d5e76e39aab45430?hp=b5b99015665f34d33abf968066d66a0e15b9e45e

Merge branch 'master' of tardis:/dotfiles
---

diff --git a/Makefile b/Makefile
index 3c9162d..9c266c3 100644
--- 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 14878a7..83ae3d5 100644
--- 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 81c5618..7369201 100644
--- 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 eedbcc4..fef5b6d 100644
--- 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 18fe7e2..c58da48 100644
--- 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)*})