diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-04 00:05:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 00:05:03 +0100 |
| commit | 02a11717a4f8e6775da8e19f11371e96d931d051 (patch) | |
| tree | 68595dab14f96ebe0ca11d7f5c681b46c1f744ec /modules/programs | |
| parent | 5a52850a03effecf335bdb564eaa94759f416426 (diff) | |
| parent | b6e692361e033576a81084d776728af8320ae580 (diff) | |
Merge pull request #60 from nix-hackers/tmux-iterm2
tmux: play nice with iTerm2
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/tmux.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix index 9ad9d63..906a0d7 100644 --- a/modules/programs/tmux.nix +++ b/modules/programs/tmux.nix @@ -73,6 +73,13 @@ in description = "Enable vim style keybindings for copy mode, and navigation of tmux panes."; }; + programs.tmux.iTerm2 = mkOption { + type = types.bool; + default = false; + example = true; + description = "Cater to iTerm2 and its tmux integration, as appropriate."; + }; + programs.tmux.tmuxOptions = mkOption { internal = true; type = types.attrsOf (types.submodule text); @@ -100,7 +107,7 @@ in source-file -q /etc/tmux.conf.local ''; - programs.tmux.tmuxOptions.login-shell.text = if stdenv.isDarwin then '' + programs.tmux.tmuxOptions.login-shell.text = if stdenv.isDarwin && !cfg.iTerm2 then '' set -g default-command "${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace ${config.environment.loginShell}" '' else '' set -g default-command "${config.environment.loginShell}" |