aboutsummaryrefslogtreecommitdiffstats
path: root/.tmux.conf
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2016-08-16 16:05:08 +0200
committerDavid Runge <dave@sleepmap.de>2016-08-16 16:05:08 +0200
commit5398090beb583efb86717010f90ebdf2552c4b94 (patch)
treea550fa866f8ba0c66296888031298582ff3781d3 /.tmux.conf
parenta24212e200da85e91c20d3f7c6631a19b4bab04f (diff)
parent30d3a2fdefce354b65019226ba1762b0403b8439 (diff)
downloaddotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.gz
dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.bz2
dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.xz
dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.zip
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles: (28 commits) .config/qtile/config.py: Disabling broken TreeTab layout. Adding scide to dev. Changing background picture to lowercase. Enabling notification widget. .zsh.after/aliases.zsh: Adding automatic selection of audio backends for mpv. bin/set_volume: Adding further increase/decrease shortcuts. .scvimrc: Adding system runtimepath for .sc files. .config/mpd/mpd-trvlr-jack.conf: Adding mpd configuration for trvlr using JACK. .config/mpd/mpd-trvlr.conf: Adding mpd configuration for trlvr. .config/mpd/mpd.conf: Switching audio backend to JACK in default mpd config. .config/conky/side: Removing broken xft settings. .config/compton.conf .config/SuperCollider/startupfiles/rme_fireface800.scd: Removing obsolete configurations. .config/SuperCollider/startup.scd: Adding a generic startupFile for SuperCollider. .gitignore: Unignoring SuperCollider's startup file. .processing/preferences.txt: Removing configuration due to constant regneration and metadata leakage. .config/patchagerc: Removing useless configuration. .config/SuperCollider/sc_ide_conf.yaml: Removing redundant sc_ide_conf.yaml. .arduino/preferences.txt: Removing arduino preferences due to redundancy. .scvimrc: Using horizontal split in tmux. Removing old trash from ftplugin identifiers. Using SClangStart only on scd files. .config/gtk-3.0/gtk.css: Adding css to disable double drawing of menus/title bars and client-side decoration. .config/compton.conf: Disabling fading (too slow). Lowering shadow-radius, so it won't interfere with WM bars. .vdirsyncer/config: Adding 'b wins' conflict_resolution for akt. ...
Diffstat (limited to '.tmux.conf')
-rw-r--r--.tmux.conf15
1 files changed, 9 insertions, 6 deletions
diff --git a/.tmux.conf b/.tmux.conf
index e1d1a17..9cf6778 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -36,6 +36,9 @@ set -g history-limit 10000
# set mouse mode on
set -g mouse on
+# set the lock command to be vlock
+set -g lock-command vlock
+
# Wheel scroll in pane
unbind -T root WheelUpPane
unbind -T root WheelDownPane
@@ -80,12 +83,12 @@ set -g message-attr bold
# set status-interval to 2 for tmux-mem-cpu-load
set -g status-interval 1
set -g status-left '#[fg=colour235,bg=colour252,bold] #(hostname) #[fg=colour245,bg=colour238,bold] #(whoami) (#S) '
-set -g status-right '#[fg=colour23,bg=colour234]|>#[fg=white,bg=colour234]#(~/bin/get_cpu_status) \
-#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234] #(~/bin/get_mem) \
-#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234] #(~/bin/get_load) \
-#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234] #(~/bin/get_battery_status) \
-#[fg=colour23,bg=colour234]<|>#[fg=white,bg=colour234] %Y%m%d (%a) \
-#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234] %H:%M:%S \
+set -g status-right '#[fg=colour23,bg=colour234]|>#[fg=white,bg=colour234]#(~/bin/get_cpu_status)\
+#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]#(~/bin/get_mem)\
+#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]#(~/bin/get_load)\
+#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]#(~/bin/get_battery_status)\
+#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]%Y%m%d/%a\
+#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]%H:%M:%S\
#[fg=colour23,bg=colour234]<|'
set -g window-status-format '#[fg=colour235,bg=colour252,bold] #I: #W '
set -g window-status-current-format '#[fg=black,bg=colour23,noreverse,bold] #I: #W '