diff --git a/home/tmux.nix b/home/tmux.nix
index 46e561f..72e637a 100644
--- a/home/tmux.nix
+++ b/home/tmux.nix
@@ -6,6 +6,9 @@
     historyLimit = 50000;
     keyMode = "emacs";
     mouse = false;
+    newSession = true;
+    # address vim mode switching delay (http://superuser.com/a/252717/65504)
+    escapeTime = 0;
     plugins = with pkgs.tmuxPlugins; [
       yank
       {
@@ -29,6 +32,12 @@
       bind v split-window -c "#{pane_current_path}" -h
       bind s split-window -c "#{pane_current_path}" -v
 
+      # confirm before killing a window or the server
+      bind-key k confirm kill-window
+      bind-key K confirm kill-server
+
+      set -g renumber-windows on
+
       # FILE: iceberg.tmux.conf
       # REPO: https://github.com/gkeep/iceberg-dark
       # MAINTAINER: gkeep <gkeep77@protonmail.com>