summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs/init.el2
-rw-r--r--tmux/conf1
2 files changed, 2 insertions, 1 deletions
diff --git a/emacs/init.el b/emacs/init.el
index 0ef2e47..83d81d4 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -51,7 +51,7 @@
(auto-save-visited-mode 1)
(blink-cursor-mode -1)
(column-number-mode 1)
-(display-time-mode 1)
+(display-time-mode (if (getenv "TMUX") -1 1))
(electric-indent-mode -1)
(global-auto-revert-mode 1)
(show-paren-mode 1)
diff --git a/tmux/conf b/tmux/conf
index 49eb21c..7358e20 100644
--- a/tmux/conf
+++ b/tmux/conf
@@ -4,3 +4,4 @@ set -g base-index 1
set -g escape-time 0
set -g mouse on
set -g renumber-windows on
+set -g status-right "%R %Z"