Merge 088d81b6b6 into 0ff53f6d33

modules/programs/tmux.nix

@@ -94,6 +94,11 @@ let
       bind-key -N "Kill the current pane" x kill-pane
     ''}
 
+    ${optionalString cfg.trueColor ''
+      set -g default-terminal "tmux-256color"
+      set -ag terminal-overrides ",xterm-256color:RGB"
+    ''}
+
     set  -g mouse             ${boolToStr cfg.mouse}
     set  -g focus-events      ${boolToStr cfg.focusEvents}
     setw -g aggressive-resize ${boolToStr cfg.aggressiveResize}
@@ -303,6 +308,8 @@ in {
 
       tmuxinator.enable = mkEnableOption "tmuxinator";
 
+      trueColor = mkEnableOption "true color support";
+
       plugins = mkOption {
         type = with types;
           listOf (either package pluginModule) // {

tests/modules/programs/tmux/default-shell.conf

@@ -18,6 +18,8 @@ set -g mode-keys   emacs
 
 
 
+
+
 set  -g mouse             off
 set  -g focus-events      off
 setw -g aggressive-resize off

tests/modules/programs/tmux/default.nix

@@ -8,4 +8,5 @@
   tmux-shortcut-without-prefix = ./shortcut-without-prefix.nix;
   tmux-prefix = ./prefix.nix;
   tmux-mouse-enabled = ./mouse-enabled.nix;
+  tmux-truecolor-enabled = ./truecolor-enabled.nix;
 }

tests/modules/programs/tmux/disable-confirmation-prompt.conf

@@ -18,6 +18,8 @@ bind-key -N "Kill the current window" & kill-window
 bind-key -N "Kill the current pane" x kill-pane
 
 
+
+
 set  -g mouse             off
 set  -g focus-events      off
 setw -g aggressive-resize off

tests/modules/programs/tmux/mouse-enabled.conf

@@ -16,6 +16,8 @@ set -g mode-keys   emacs
 
 
 
+
+
 set  -g mouse             on
 set  -g focus-events      off
 setw -g aggressive-resize off

tests/modules/programs/tmux/prefix.conf

@@ -21,6 +21,8 @@ bind -N "Send the prefix key through to the application" \
 
 
 
+
+
 set  -g mouse             off
 set  -g focus-events      off
 setw -g aggressive-resize off

tests/modules/programs/tmux/shortcut-without-prefix.conf

@@ -22,6 +22,8 @@ bind C-a last-window
 
 
 
+
+
 set  -g mouse             off
 set  -g focus-events      off
 setw -g aggressive-resize off

tests/modules/programs/tmux/truecolor-enabled.conf

@@ -0,0 +1,33 @@
+# ============================================= #
+# Start with defaults from the Sensible plugin  #
+# --------------------------------------------- #
+run-shell @sensible_rtp@
+# ============================================= #
+
+set  -g default-terminal "screen"
+set  -g base-index      0
+setw -g pane-base-index 0
+
+
+
+
+
+set -g status-keys emacs
+set -g mode-keys   emacs
+
+
+
+
+
+
+
+set -g default-terminal "tmux-256color"
+set -ag terminal-overrides ",xterm-256color:RGB"
+
+
+set  -g mouse             off
+setw -g aggressive-resize off
+setw -g clock-mode-style  12
+set  -s escape-time       500
+set  -g history-limit     2000
+

tests/modules/programs/tmux/truecolor-enabled.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.tmux = {
+      enable = true;
+      trueColor = true;
+    };
+
+    nixpkgs.overlays = [
+      (self: super: {
+        tmuxPlugins = super.tmuxPlugins // {
+          sensible = super.tmuxPlugins.sensible // { rtp = "@sensible_rtp@"; };
+        };
+      })
+    ];
+
+    nmt.script = ''
+      assertFileExists home-files/.config/tmux/tmux.conf
+      assertFileContent home-files/.config/tmux/tmux.conf \
+        ${./truecolor-enabled.conf}
+    '';
+  };
+}

tests/modules/programs/tmux/vi-all-true.conf

@@ -18,6 +18,8 @@ set -g mode-keys   vi
 
 
 
+
+
 set  -g mouse             off
 set  -g focus-events      off
 setw -g aggressive-resize on