diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-10-12 21:58:33 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-10-12 21:59:41 +0200 |
| commit | 9a04aea8ea1e7e8a6382516e4ac1f8b9245c4b09 (patch) | |
| tree | b30f72bdf4fc39e55db5c4b32b35c9c862755254 /modules/programs | |
| parent | 9a192471bbb58a37b8dbb683bfb7a4a19088bc8e (diff) | |
tmux: remove reattach-to-user-namespace
It's not been needed anymore for a few macOS releases now.
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/tmux.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix index 906a0d7..206ac7e 100644 --- a/modules/programs/tmux.nix +++ b/modules/programs/tmux.nix @@ -95,6 +95,10 @@ in config = mkIf cfg.enable { + warnings = mkIf cfg.iTerm2 [ + "The programs.tmux.iTerm2 is no longer needed and doesn't do anything anymore" + ]; + environment.systemPackages = [ # Include wrapped tmux package. tmux @@ -107,9 +111,7 @@ in source-file -q /etc/tmux.conf.local ''; - 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 '' + programs.tmux.tmuxOptions.login-shell.text = '' set -g default-command "${config.environment.loginShell}" ''; @@ -161,7 +163,7 @@ in '' + optionalString stdenv.isLinux '' bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel '' + optionalString stdenv.isDarwin '' - bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace pbcopy" + bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "pbcopy" ''); }; |