diff options
Diffstat (limited to 'home-manager/tests/modules/programs/tmux')
6 files changed, 4 insertions, 13 deletions
diff --git a/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf index b599e603e4a..222f733d5f3 100644 --- a/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf +++ b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.conf @@ -28,4 +28,3 @@ setw -g clock-mode-style 12 set -s escape-time 500 set -g history-limit 2000 - diff --git a/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix index e3d13a4b1b2..9c65ad6eee4 100644 --- a/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix +++ b/home-manager/tests/modules/programs/tmux/disable-confirmation-prompt.nix @@ -12,9 +12,7 @@ with lib; nixpkgs.overlays = [ (self: super: { tmuxPlugins = super.tmuxPlugins // { - sensible = super.tmuxPlugins.sensible // { - rtp = "@sensible_rtp@"; - }; + sensible = super.tmuxPlugins.sensible // { rtp = "@sensible_rtp@"; }; }; }) ]; diff --git a/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf index 66b10183750..97e226316f4 100644 --- a/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf +++ b/home-manager/tests/modules/programs/tmux/emacs-with-plugins.conf @@ -28,8 +28,6 @@ setw -g clock-mode-style 24 set -s escape-time 500 set -g history-limit 2000 - - # ============================================= # # Load plugins with Home Manager # # --------------------------------------------- # @@ -52,3 +50,4 @@ run-shell @tmuxplugin_prefix_highlight_rtp@ run-shell @tmuxplugin_fzf_tmux_url_rtp@ # ============================================= # + diff --git a/home-manager/tests/modules/programs/tmux/hm-session-vars.sh b/home-manager/tests/modules/programs/tmux/hm-session-vars.sh deleted file mode 100644 index 40d9c24b50d..00000000000 --- a/home-manager/tests/modules/programs/tmux/hm-session-vars.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Only source this once. -if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi -export __HM_SESS_VARS_SOURCED=1 - -export TMUX_TMPDIR="${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}" diff --git a/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix b/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix index 34e9129c5a4..ca2de66310d 100644 --- a/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix +++ b/home-manager/tests/modules/programs/tmux/secure-socket-enabled.nix @@ -11,7 +11,8 @@ with lib; nmt.script = '' assertFileExists home-path/etc/profile.d/hm-session-vars.sh - assertFileContent home-path/etc/profile.d/hm-session-vars.sh ${./hm-session-vars.sh} + assertFileContains home-path/etc/profile.d/hm-session-vars.sh \ + 'export TMUX_TMPDIR="''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}"' ''; }; } diff --git a/home-manager/tests/modules/programs/tmux/vi-all-true.conf b/home-manager/tests/modules/programs/tmux/vi-all-true.conf index 08e37e19b97..de1cbe06ebc 100644 --- a/home-manager/tests/modules/programs/tmux/vi-all-true.conf +++ b/home-manager/tests/modules/programs/tmux/vi-all-true.conf @@ -28,4 +28,3 @@ setw -g clock-mode-style 24 set -s escape-time 500 set -g history-limit 2000 - |