From c137718ff7ead30c2424a87dc9d47c2193f4b83b Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 6 Nov 2016 23:38:42 +0100
Subject: [PATCH] move tmux.conf to programs.tmux module

---
 config.nix                     |  17 +++++++---------
 modules/programs/.tmux.nix.swp | Bin 0 -> 12288 bytes
 modules/programs/tmux.nix      |  36 ++++++++++++++++++++-------------
 3 files changed, 29 insertions(+), 24 deletions(-)
 create mode 100644 modules/programs/.tmux.nix.swp

diff --git a/config.nix b/config.nix
index 82a1f44..6cd81b4 100644
--- a/config.nix
+++ b/config.nix
@@ -49,6 +49,13 @@ let
       programs.tmux.enableMouse = true;
       programs.tmux.enableVim = true;
 
+      programs.tmux.tmuxConfig = ''
+        bind 0 set status
+
+        set -g status-bg black
+        set -g status-fg white
+      '';
+
       environment.variables.EDITOR = "vim";
       environment.variables.HOMEBREW_CASK_OPTS = "--appdir=/Applications/cask";
 
@@ -60,16 +67,6 @@ let
       environment.shellAliases.g = "git log --graph --oneline";
       environment.shellAliases.gd = "git diff --minimal -p";
 
-      environment.etc."tmux.conf".text = ''
-        ${config.programs.tmux.config}
-        bind 0 set status
-
-        set -g status-bg black
-        set -g status-fg white
-
-        source-file $HOME/.tmux.conf.local
-      '';
-
       environment.etc."zprofile".text = ''
         # /etc/zprofile: DO NOT EDIT -- this file has been generated automatically.
         # This file is read for login shells.
diff --git a/modules/programs/.tmux.nix.swp b/modules/programs/.tmux.nix.swp
new file mode 100644
index 0000000000000000000000000000000000000000..12b196fe50e56b8d52063503f6b182ef076e0493
GIT binary patch
literal 12288
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

literal 0
HcmV?d00001

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index 18967d2..ea17d3d 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -8,8 +8,12 @@ let
 
   cfg = config.programs.tmux;
 
-  tmuxConfigs =
-    mapAttrsToList (n: v: "${v}") cfg.text;
+  text = import ../system/write-text.nix {
+    inherit lib;
+    mkTextDerivation = name: text: pkgs.writeText "tmux-options-${name}" text;
+  };
+
+  tmuxOptions = concatMapStringsSep "\n" (attr: attr.text) (attrValues cfg.tmuxOptions);
 
 in {
   options = {
@@ -49,16 +53,14 @@ in {
       '';
     };
 
-    programs.tmux.config = mkOption {
+    programs.tmux.tmuxConfig = mkOption {
       type = types.lines;
-      description = ''
-        Configuration options.
-      '';
+      default = "";
     };
 
-    programs.tmux.text = mkOption {
+    programs.tmux.tmuxOptions = mkOption {
       internal = true;
-      type = types.attrsOf types.lines;
+      type = types.attrsOf (types.submodule text);
       default = {};
     };
 
@@ -66,15 +68,13 @@ in {
 
   config = {
 
-    programs.tmux.config = concatStringsSep "\n" tmuxConfigs;
-
-    programs.tmux.text.login-shell = if stdenv.isDarwin then ''
+    programs.tmux.tmuxOptions.login-shell.text = if stdenv.isDarwin then ''
       set -g default-command "reattach-to-user-namespace ${cfg.loginShell}"
     '' else ''
       set -g default-command "${cfg.loginShell}"
     '';
 
-    programs.tmux.text.sensible = mkIf cfg.enableSensible (''
+    programs.tmux.tmuxOptions.sensible.text = mkIf cfg.enableSensible (''
       set -g default-terminal "screen-256color"
       setw -g aggressive-resize on
 
@@ -96,13 +96,13 @@ in {
       # set -g utf8 on
     '');
 
-    programs.tmux.text.mouse = mkIf cfg.enableMouse ''
+    programs.tmux.tmuxOptions.mouse.text = mkIf cfg.enableMouse ''
       set -g mouse on
       setw -g mouse on
       set -g terminal-overrides 'xterm*:smcup@:rmcup@'
     '';
 
-    programs.tmux.text.vim = mkIf cfg.enableVim (''
+    programs.tmux.tmuxOptions.vim.text = mkIf cfg.enableVim (''
       setw -g mode-keys vi
 
       bind h select-pane -L
@@ -119,5 +119,13 @@ in {
       bind -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
     '');
 
+    environment.etc."tmux.conf".text = ''
+      ${tmuxOptions}
+
+      ${cfg.tmuxConfig}
+
+      source-file -q /etc/tmux.conf.local
+    '';
+
   };
 }