diff --git a/nix/home/opdavies/default.nix b/nix/home/opdavies/default.nix index 1a874516..9af9f5ed 100644 --- a/nix/home/opdavies/default.nix +++ b/nix/home/opdavies/default.nix @@ -70,5 +70,6 @@ in ]; PULUMI_SKIP_UPDATE_CHECK = "true"; REPOS = "$HOME/Code"; + XDG_CONFIG_HOME = "${config.xdg.configHome}"; }; } diff --git a/nix/modules/home-manager/cli/tmux-sessionizer.nix b/nix/modules/home-manager/cli/tmux-sessionizer.nix index 058c29cc..2927781b 100644 --- a/nix/modules/home-manager/cli/tmux-sessionizer.nix +++ b/nix/modules/home-manager/cli/tmux-sessionizer.nix @@ -13,7 +13,7 @@ with lib; config = mkIf config.homeManagerModules.tmux-sessionizer.enable { home.packages = with pkgs; [ tmux-sessionizer ]; - home.file.".tmux-sessionizer".source = "${ + home.file."${config.xdg.configHome}/tmux-sessionizer/default".source = "${ pkgs.writeShellApplication { name = ".tmux-sessionizer"; diff --git a/nix/pkgs/tmux-sessionizer/default.nix b/nix/pkgs/tmux-sessionizer/default.nix index 21cd6dee..a3e8c30c 100644 --- a/nix/pkgs/tmux-sessionizer/default.nix +++ b/nix/pkgs/tmux-sessionizer/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation { tmux ]; - patches = [ ./configure-directories.patch ]; + patches = [ + ./move-default-script.patch + ./configure-directories.patch + ]; installPhase = '' mkdir -p $out/bin diff --git a/nix/pkgs/tmux-sessionizer/move-default-script.patch b/nix/pkgs/tmux-sessionizer/move-default-script.patch new file mode 100644 index 00000000..ad61c44b --- /dev/null +++ b/nix/pkgs/tmux-sessionizer/move-default-script.patch @@ -0,0 +1,13 @@ +diff --git a/tmux-sessionizer b/tmux-sessionizer +index fa1bec5..1a5319f 100755 +--- a/tmux-sessionizer ++++ b/tmux-sessionizer +@@ -15,7 +15,7 @@ hydrate() { + if [ -f $2/.tmux-sessionizer ]; then + tmux send-keys -t $1 "source $2/.tmux-sessionizer" c-M + elif [ -f $HOME/.tmux-sessionizer ]; then +- tmux send-keys -t $1 "source $HOME/.tmux-sessionizer" c-M ++ tmux send-keys -t $1 "source $XDG_CONFIG_HOME/tmux-sessionizer/default" c-M + fi + } +