mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-16 21:38:21 +00:00
Code Activity

fix tmux loginShell option

Browse source
This commit is contained in:
Daiderd Jordan 2016-11-05 00:08:20 +01:00
parent ccedaf9aea
commit efc38f72f9
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.nix
View file

@ -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>

4
modules/tmux.nix
View file

@ -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 ''