Remove xdg fix for tmux

It was upstreamed and 3.2 is now available on nixpkgs.
This commit is contained in:
Henrik Lissner 2021-07-26 13:51:15 -04:00
parent 6d45635675
commit c80319d84e

View file

@ -3,13 +3,6 @@
with lib; with lib;
with lib.my; with lib.my;
let cfg = config.modules.shell.tmux; let cfg = config.modules.shell.tmux;
# Despite tmux/tmux#142, tmux will support XDG in 3.2. Sadly, only 3.0 is
# available on nixpkgs, and 3.1b on master (tmux/tmux@15d7e56), so I
# implement it myself:
tmux = (pkgs.writeScriptBin "tmux" ''
#!${pkgs.stdenv.shell}
exec ${pkgs.tmux}/bin/tmux -f "$TMUX_HOME/config" "$@"
'');
configDir = config.dotfiles.configDir; configDir = config.dotfiles.configDir;
in { in {
options.modules.shell.tmux = with types; { options.modules.shell.tmux = with types; {
@ -18,9 +11,9 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
user.packages = [ tmux ]; user.packages = with pkgs; [ tmux ];
modules.theme.onReload.tmux = "${tmux}/bin/tmux source-file $TMUX_HOME/extraInit"; modules.theme.onReload.tmux = "${pkgs.tmux}/bin/tmux source-file $TMUX_HOME/extraInit";
modules.shell.zsh = { modules.shell.zsh = {
rcInit = "_cache tmuxifier init -"; rcInit = "_cache tmuxifier init -";