mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-13 20:30:02 +00:00
Code Activity

tmux: remove reattach-to-user-namespace

Browse source 
It's not been needed anymore for a few macOS releases now.
This commit is contained in:
Daiderd Jordan 2018-10-12 21:58:33 +02:00
parent 9a192471bb
commit 9a04aea8ea
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/programs/tmux.nix
View file

@ -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"
'');
};