From fdd2b7fac857cb8f42cba8772da4ab2cdcf8b875 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Sun, 21 Jan 2024 17:51:44 -0500
Subject: [PATCH] tmux configuration

---
 nix/base-system/flake.nix               | 18 +++++++++++++-----
 .tmux.conf => nix/base-system/tmux.conf |  2 +-
 nix/darwin/flake.lock                   |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)
 rename .tmux.conf => nix/base-system/tmux.conf (97%)

diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 1a69a15..eeb1be1 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -198,22 +198,30 @@ EOF";
           source = ./init.lua;
         };
 
-        programs = with pkgs; {
-          zsh.enable = true;  # default shell on catalina
+        programs = {
+          zsh = {
+            enable = true;  # default shell on catalina
           # This is a total hack but we don't want the default clobbering it which it does if it's an empty string or null
-          zsh.promptInit = "#noop";
-          zsh.interactiveShellInit = (builtins.readFile ./.zshrc);
+            promptInit = "#noop";
+            interactiveShellInit = (builtins.readFile ./.zshrc);
+          };
+
+          tmux = {
+            enable = true;
+            enableVim = true;
+            extraConfig = (builtins.readFile ./tmux.conf);
+          };
         };
         environment.systemPackages = (with pkgs; [
             args.pkgs.isabelle
             args.pkgs.terraform # TODO(jeremy): Replace with opentofu when that is an option.
+            tmux-sessionizer
             consul
             consul-template
             nomad
             postgresql
             oha
             nodejs
-            tmux
             gnumake
             # TODO find a version of the julia package that will install
             # on darwin and add it as an overlay
diff --git a/.tmux.conf b/nix/base-system/tmux.conf
similarity index 97%
rename from .tmux.conf
rename to nix/base-system/tmux.conf
index d8485ed..b1c0d16 100644
--- a/.tmux.conf
+++ b/nix/base-system/tmux.conf
@@ -17,7 +17,7 @@ set -g default-terminal "screen-256color"
 ### example of some useful key-bindings
 #bind-key "~" split-window "exec htop"
 
-bind-key "R" source-file ~/.tmux.conf
+bind-key C-c copy-mode
 #bind-key "a" select-window -l
 #bind-key "C-a" select-window -l
 
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index d0fdb2e..2559cc7 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -37,12 +37,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-VDkul+Z32T3/AhU5fY7Wtaf7n6U3WOPFG63Z7lL2WjQ=",
-        "path": "/nix/store/4dzkjjnaj1wf796hms09nnqfr3d7w1zf-source/nix/base-system",
+        "narHash": "sha256-Uat1zSsHZfJ0lf1Ya9aW8r0mjBNtbt8woaSmHNyDGRA=",
+        "path": "/nix/store/4kzm062qwsfzq1vza029ic4lx9zpdy8p-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/4dzkjjnaj1wf796hms09nnqfr3d7w1zf-source/nix/base-system",
+        "path": "/nix/store/4kzm062qwsfzq1vza029ic4lx9zpdy8p-source/nix/base-system",
         "type": "path"
       }
     },