From efc38f72f9d38146b938c475a1b47693bc508bb6 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 5 Nov 2016 00:08:20 +0100
Subject: [PATCH] fix tmux loginShell option

---
 config.nix       | 5 +++--
 modules/tmux.nix | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/config.nix b/config.nix
index d07280f..338be66 100644
--- a/config.nix
+++ b/config.nix
@@ -42,7 +42,7 @@ let
           serviceConfig.ProcessType = "Background";
         };
 
-      programs.tmux.loginShell = "${pkgs.zsh}/bin/zsh";
+      programs.tmux.loginShell = "${pkgs.zsh}/bin/zsh -l";
       programs.tmux.enableSensible = true;
       programs.tmux.enableMouse = true;
       programs.tmux.enableVim = true;
@@ -148,11 +148,12 @@ in {
         set bs=indent,start
 
         set nowrap
-
         set list
         set listchars=tab:»·,trail:·,extends:⟩,precedes:⟨
         set fillchars+=vert:\ ,stl:\ ,stlnc:\ 
 
+        set lazyredraw
+
         set clipboard=unnamed
 
         cmap <C-g> <Esc>
diff --git a/modules/tmux.nix b/modules/tmux.nix
index a983d19..c54d0a2 100644
--- a/modules/tmux.nix
+++ b/modules/tmux.nix
@@ -69,7 +69,7 @@ in {
     programs.tmux.config = lib.concatStringsSep "\n" tmuxConfigs;
 
     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 ''
       set -g default-command "${cfg.loginShell}"
     '';
@@ -94,8 +94,6 @@ in {
 
       # set -g status-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 ''