Prefer absolutepath for basename except fish

kachick · Aug 4, 2023 · e6ce3a3 · e6ce3a3
1 parent b9585e5
commit e6ce3a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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)