From e6ce3a3450197d8f1798901905b282cd9467e08f Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 5 Aug 2023 00:19:08 +0900 Subject: [PATCH] Prefer absolutepath for basename except fish --- home-manager/bash.nix | 11 +++++++++-- home-manager/initExtra.bash | 7 ------- home-manager/zsh.nix | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/home-manager/bash.nix b/home-manager/bash.nix index e1f17953..a3b7c062 100644 --- a/home-manager/bash.nix +++ b/home-manager/bash.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, lib, pkgs, ... }: { programs.starship.enableBashIntegration = true; @@ -65,7 +65,14 @@ historyIgnore = [ "ls" "cd" "z" ]; # Extracting because embedded here requires complex escape with nix multiline. - initExtra = builtins.readFile ./initExtra.bash; + initExtra = '' + # https://github.com/starship/starship/blob/0d98c4c0b7999f5a8bd6e7db68fd27b0696b3bef/docs/uk-UA/advanced-config/README.md#change-window-title + function set_win_title() { + echo -ne "\033]0; $(${lib.getBin pkgs.coreutils}/bin/basename "$PWD") \007" + } + # shellcheck disable=SC2034 + starship_precmd_user_func="set_win_title" + '' + builtins.readFile ./initExtra.bash; logoutExtra = '' # when leaving the console clear the screen to increase privacy diff --git a/home-manager/initExtra.bash b/home-manager/initExtra.bash index 9208044b..d9924a8a 100644 --- a/home-manager/initExtra.bash +++ b/home-manager/initExtra.bash @@ -45,10 +45,3 @@ xterm* | rxvt*) *) ;; esac - -# https://github.com/starship/starship/blob/0d98c4c0b7999f5a8bd6e7db68fd27b0696b3bef/docs/uk-UA/advanced-config/README.md#change-window-title -function set_win_title() { - echo -ne "\033]0; $(basename "$PWD") \007" -} -# shellcheck disable=SC2034 -starship_precmd_user_func="set_win_title" diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index dea209ee..87d9aa98 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -114,7 +114,7 @@ # https://github.com/starship/starship/blob/0d98c4c0b7999f5a8bd6e7db68fd27b0696b3bef/docs/uk-UA/advanced-config/README.md#change-window-title function set_win_title() { - echo -ne "\033]0; $(basename "$PWD") \007" + echo -ne "\033]0; $(${lib.getBin pkgs.coreutils}/bin/basename "$PWD") \007" } precmd_functions+=(set_win_title)