Move tmux out of HM and configure jump to use the same key as easymotion

Signed-off-by: Mel <einebeere@gmail.com>

3 files changed, 29 insertions, 11 deletions

diff --git a/modules/common.nix b/modules/common.nix
index a615491..290befd 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -6,6 +6,7 @@
     ./user.nix
     ./locale.nix
     ./vim.nix
+    ./tmux.nix
     ./gnome.nix
     ./fonts.nix
     ./flatpak.nix
@@ -45,7 +46,6 @@
     virt-manager.enable = true;
     fish.enable = true;
     git.enable = true;
-    tmux.enable = true;
 
     adb.enable = true;
     
diff --git a/modules/home/common.nix b/modules/home/common.nix
index 8e1a1c7..3d1c143 100644
--- a/modules/home/common.nix
+++ b/modules/home/common.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs = {
@@ -13,15 +13,6 @@
       extraConfig.init.defaultBranch = "main";
     };
 
-    tmux = {
-      enable = true;
-      mouse = true;
-      keyMode = "vi";
-      plugins = with pkgs.tmuxPlugins; [
-        yank fpp open fuzzback
-      ];
-    };
-
     fish = {
       enable = true;
       interactiveShellInit = ''
diff --git a/modules/tmux.nix b/modules/tmux.nix
new file mode 100644
index 0000000..8aefc69
--- /dev/null
+++ b/modules/tmux.nix
@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+
+{
+  programs.tmux = {
+    enable = true;
+    # TODO: check with upstream if maybe the system-level
+    # tmux configuration can have some of these HM options.
+    # mouse = true;
+    keyMode = "vi";
+
+    plugins = with pkgs.tmuxPlugins; [
+      sensible
+      yank
+      fpp
+      open
+      fuzzback
+      jump
+      vim-tmux-navigator
+    ];
+
+    extraConfigBeforePlugins = ''
+      # * jump
+      # same as bi-directional vim easymotion key
+      set -g @jump-key 's'
+    '';
+  };
+}