Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

programs.tmux: use xdg config path (#1928)

Browse source 
Tmux 3.2 includes support to use `$XDG_CONFIG_HOME/tmux/tmux.conf` as
well as `~/.config/tmux/tmux.conf` for configuration file.
This commit is contained in:
Mario Rodas 2021-04-23 02:25:13 -05:00 committed by GitHub
parent 26fa84ebce
commit e00dd0d7d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/programs/tmux.nix
View file

@ -109,7 +109,7 @@ let
}
)];
home.file.".tmux.conf".text = ''
xdg.configFile."tmux/tmux.conf".text = ''
# ============================================= #
# Load plugins with Home Manager #
# --------------------------------------------- #
@ -335,10 +335,9 @@ in
};
})
# config file ~/.tmux.conf
{ home.file.".tmux.conf".text = mkBefore tmuxConf; }
{ xdg.configFile."tmux/tmux.conf".text = mkBefore tmuxConf; }
(mkIf (cfg.plugins != []) configPlugins)
{ home.file.".tmux.conf".text = mkAfter cfg.extraConfig; }
{ xdg.configFile."tmux/tmux.conf".text = mkAfter cfg.extraConfig; }
])
);
}

4
tests/modules/programs/tmux/default-shell.nix
View file

@ -19,8 +19,8 @@ in {
};
nmt.script = ''
assertFileExists home-files/.tmux.conf
assertFileContent home-files/.tmux.conf \
assertFileExists home-files/.config/tmux/tmux.conf
assertFileContent home-files/.config/tmux/tmux.conf \
${substituteExpected ./default-shell.conf}
'';
};

4
tests/modules/programs/tmux/disable-confirmation-prompt.nix
View file

@ -18,8 +18,8 @@ with lib;
];
nmt.script = ''
assertFileExists home-files/.tmux.conf
assertFileContent home-files/.tmux.conf \
assertFileExists home-files/.config/tmux/tmux.conf
assertFileContent home-files/.config/tmux/tmux.conf \
${./disable-confirmation-prompt.conf}
'';
};

6
tests/modules/programs/tmux/emacs-with-plugins.nix
View file

@ -42,8 +42,10 @@ with lib;
];
nmt.script = ''
assertFileExists home-files/.tmux.conf
assertFileContent home-files/.tmux.conf ${./emacs-with-plugins.conf}
assertFileExists home-files/.config/tmux/tmux.conf
assertFileContent home-files/.config/tmux/tmux.conf ${
./emacs-with-plugins.conf
}
'';
};
}

2
tests/modules/programs/tmux/not-enabled.nix
View file

@ -7,7 +7,7 @@ with lib;
programs.tmux = { enable = false; };
nmt.script = ''
assertPathNotExists home-files/.tmux.conf
assertPathNotExists home-files/.config/tmux/tmux.conf
'';
};
}

4
tests/modules/programs/tmux/prefix.nix
View file

@ -18,8 +18,8 @@ with lib;
];
nmt.script = ''
assertFileExists home-files/.tmux.conf
assertFileContent home-files/.tmux.conf \
assertFileExists home-files/.config/tmux/tmux.conf
assertFileContent home-files/.config/tmux/tmux.conf \
${./prefix.conf}
'';
};

4
tests/modules/programs/tmux/shortcut-without-prefix.nix
View file

@ -19,8 +19,8 @@ with lib;
];
nmt.script = ''
assertFileExists home-files/.tmux.conf
assertFileContent home-files/.tmux.conf \
assertFileExists home-files/.config/tmux/tmux.conf
assertFileContent home-files/.config/tmux/tmux.conf \
${./shortcut-without-prefix.conf}
'';
};

4
tests/modules/programs/tmux/vi-all-true.nix
View file

@ -22,8 +22,8 @@ with lib;
];
nmt.script = ''
assertFileExists home-files/.tmux.conf
assertFileContent home-files/.tmux.conf ${./vi-all-true.conf}
assertFileExists home-files/.config/tmux/tmux.conf
assertFileContent home-files/.config/tmux/tmux.conf ${./vi-all-true.conf}
'';
};
}