about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-05-27 13:23:48 +0200
committerJoachim Fasting <joachifm@users.noreply.github.com>2016-05-27 13:23:48 +0200
commita487cacef448e3cb2b3de7eed0c1e927e301700b (patch)
treec85c58b760b4ce37dd5f59c4e3dadd44dd3d6c26 /nixos
parente68878a7283d5b1587e5691e642198fc8bf44aee (diff)
parent5404595b55eeefae69f2952a34dfc70e32523060 (diff)
Merge pull request #15745 from peterhoeg/tmux-env
tmux module: set TMUX_TMPDIR via environment instead of wrapper
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/tmux.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index 2fc1ed63cb368..cadf8d4ae105c 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -156,8 +156,13 @@ in {
 
   config = mkIf cfg.enable {
     environment = {
-      systemPackages = [ pkgs.tmux ];
       etc."tmux.conf".text = tmuxConf;
+
+      systemPackages = [ pkgs.tmux ];
+
+      variables = {
+        TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}'';
+      };
     };
   };
 }