mirror of
https://github.com/LnL7/nix-darwin.git
synced 2025-03-16 21:38:21 +00:00
fix tmux loginShell option
This commit is contained in:
parent
ccedaf9aea
commit
efc38f72f9
2 changed files with 4 additions and 5 deletions
|
@ -42,7 +42,7 @@ let
|
||||||
serviceConfig.ProcessType = "Background";
|
serviceConfig.ProcessType = "Background";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.tmux.loginShell = "${pkgs.zsh}/bin/zsh";
|
programs.tmux.loginShell = "${pkgs.zsh}/bin/zsh -l";
|
||||||
programs.tmux.enableSensible = true;
|
programs.tmux.enableSensible = true;
|
||||||
programs.tmux.enableMouse = true;
|
programs.tmux.enableMouse = true;
|
||||||
programs.tmux.enableVim = true;
|
programs.tmux.enableVim = true;
|
||||||
|
@ -148,11 +148,12 @@ in {
|
||||||
set bs=indent,start
|
set bs=indent,start
|
||||||
|
|
||||||
set nowrap
|
set nowrap
|
||||||
|
|
||||||
set list
|
set list
|
||||||
set listchars=tab:»·,trail:·,extends:⟩,precedes:⟨
|
set listchars=tab:»·,trail:·,extends:⟩,precedes:⟨
|
||||||
set fillchars+=vert:\ ,stl:\ ,stlnc:\
|
set fillchars+=vert:\ ,stl:\ ,stlnc:\
|
||||||
|
|
||||||
|
set lazyredraw
|
||||||
|
|
||||||
set clipboard=unnamed
|
set clipboard=unnamed
|
||||||
|
|
||||||
cmap <C-g> <Esc>
|
cmap <C-g> <Esc>
|
||||||
|
|
|
@ -69,7 +69,7 @@ in {
|
||||||
programs.tmux.config = lib.concatStringsSep "\n" tmuxConfigs;
|
programs.tmux.config = lib.concatStringsSep "\n" tmuxConfigs;
|
||||||
|
|
||||||
programs.tmux.text.login-shell = if stdenv.isDarwin then ''
|
programs.tmux.text.login-shell = if stdenv.isDarwin then ''
|
||||||
set -g default-command "reattach-to-user-namespace -l ${cfg.loginShell}"
|
set -g default-command "reattach-to-user-namespace ${cfg.loginShell}"
|
||||||
'' else ''
|
'' else ''
|
||||||
set -g default-command "${cfg.loginShell}"
|
set -g default-command "${cfg.loginShell}"
|
||||||
'';
|
'';
|
||||||
|
@ -94,8 +94,6 @@ in {
|
||||||
|
|
||||||
# set -g status-utf8 on
|
# set -g status-utf8 on
|
||||||
# set -g utf8 on
|
# set -g utf8 on
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
|
||||||
set -g default-command "reattach-to-user-namespace -l $SHELL"
|
|
||||||
'');
|
'');
|
||||||
|
|
||||||
programs.tmux.text.mouse = mkIf cfg.enableMouse ''
|
programs.tmux.text.mouse = mkIf cfg.enableMouse ''
|
||||||
|
|
Loading…
Add table
Reference in a new issue