X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tmux.conf.in;h=4b2ba9234f4202f61946fec3e5ab2876c255b6d1;hb=4453828578cf549be4354479f826a2336c3697ad;hp=c748eea2eaa38ba2cf3bc44c615f8e9e8a1ab0b0;hpb=3f5d80c3a9142c424ca2c482b6ad28c475349d42;p=config%2Fdotfiles.git

diff --git a/tmux.conf.in b/tmux.conf.in
index c748eea..4b2ba92 100644
--- a/tmux.conf.in
+++ b/tmux.conf.in
@@ -5,7 +5,7 @@
 # - To swap/renumber windows (like GNU screen's :number command) use
 #   :swap-window -t <number>.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,12 +23,19 @@
 
 # GENERAL
 
+# Use vlock to lock the screen. Tmux doesn't have an internal lock program
+# like GNU screen!
+set-option -g lock-command "vlock"
+# Lock sessions individually. Otherwise lock-after-time will wait on all other
+# sessions to idle before it locks this session.
+set-option -g lock-server off
+
 # Use Zsh as shell. Tmux does not display a warning if the shell isn't
 # available!
 set-option -g default-shell "/bin/zsh"
 
 # Use a larger window history, in lines.
-set-option -g history-limit 10000
+set-option -g history-limit 50000
 
 # Display Tmux messages for a longer time, in milliseconds.
 set-option -g display-time 3000
@@ -67,7 +74,10 @@ set-option -g status-bg colour12
 set-option -g status-left ""
 # Current load average and hostname (#H) on the right.
 set-option -g status-right "#(uptime | sed 's/^.*load averages*: //; s/,//g') \
-                            #H"
+                            #H \
+                            #(~/.shell/bin/temperature.pl -t TEMPERATURE)\
+                            #[] #(~/.shell/bin/battery.pl -t BATTERY)\
+                            "
 
 # Format for windows in the window list in the status line. #I window index,
 # #W window number, #F window flags.
@@ -108,7 +118,7 @@ bind-key C-t display-message
 
 # Run urlview on the current screen content. Very useful to follow links.
 # Thanks to Arch wiki (https://wiki.archlinux.org/index.php/Tmux) for the
-# basic idea.
+# basic idea how to enable this in tmux.
 bind-key C-b capture-pane \; \
              save-buffer ~/.tmp/tmux-urlview \; \
              new-window "$SHELL -c 'urlview < ~/.tmp/tmux-urlview'"