From b6639286b0d5dc5f41171fc91f4a9a24d0bb67a5 Mon Sep 17 00:00:00 2001 From: Candifloss Date: Mon, 20 Jul 2026 19:47:42 +0530 Subject: [PATCH] Fix paths for system-wide configs --- conf.d/05_paths.fish | 8 ++++---- conf.d/25_prompt_theme.fish | 2 +- functions/fish_list_themes.fish | 2 +- functions/fish_load_package_manager.fish | 4 ++-- functions/fish_load_theme.fish | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf.d/05_paths.fish b/conf.d/05_paths.fish index 771a889..7877442 100644 --- a/conf.d/05_paths.fish +++ b/conf.d/05_paths.fish @@ -4,9 +4,9 @@ fish_add_path /opt/misc_scripts fish_add_path ~/.cargo/bin # Additional function paths -set -a fish_function_path $__fish_config_dir/functions/desktop -set -a fish_function_path $__fish_config_dir/functions/work +set -a fish_function_path $__fish_sysconf_dir/functions/desktop +set -a fish_function_path $__fish_sysconf_dir/functions/work # Additional completion paths -set -a fish_complete_path $__fish_config_dir/completions/desktop -set -a fish_complete_path $__fish_config_dir/completions/work \ No newline at end of file +set -a fish_complete_path $__fish_sysconf_dir/completions/desktop +set -a fish_complete_path $__fish_sysconf_dir/completions/work \ No newline at end of file diff --git a/conf.d/25_prompt_theme.fish b/conf.d/25_prompt_theme.fish index 04a57b7..9e541c9 100644 --- a/conf.d/25_prompt_theme.fish +++ b/conf.d/25_prompt_theme.fish @@ -1,7 +1,7 @@ # Prompt theme # To get a list of available themes: -# - Check the theme directories in $__fish_config_dir/themes/ +# - Check the theme directories in $__fish_sysconf_dir/themes/ # - Or use the function `fish_list_themes` # To print the active prompt theme name: # Use function `fish_theme` diff --git a/functions/fish_list_themes.fish b/functions/fish_list_themes.fish index 190bcf6..c0e964e 100644 --- a/functions/fish_list_themes.fish +++ b/functions/fish_list_themes.fish @@ -1,5 +1,5 @@ function fish_list_themes --description "List available prompt themes" - for theme in $__fish_config_dir/themes/* + for theme in $__fish_sysconf_dir/themes/* if test -d $theme basename $theme end diff --git a/functions/fish_load_package_manager.fish b/functions/fish_load_package_manager.fish index d1a92d2..b3af09d 100644 --- a/functions/fish_load_package_manager.fish +++ b/functions/fish_load_package_manager.fish @@ -8,8 +8,8 @@ function fish_load_package_manager \ set -l pkg $argv[1] - set -l common_dir $__fish_config_dir/pkg/common - set -l pkg_dir $__fish_config_dir/pkg/$pkg + set -l common_dir $__fish_sysconf_dir/pkg/common + set -l pkg_dir $__fish_sysconf_dir/pkg/$pkg if not test -d $pkg_dir echo "fish_load_package_manager: '$pkg' not found." >&2 diff --git a/functions/fish_load_theme.fish b/functions/fish_load_theme.fish index 49debed..4e5d871 100644 --- a/functions/fish_load_theme.fish +++ b/functions/fish_load_theme.fish @@ -5,7 +5,7 @@ function fish_load_theme --description "Load a Fish prompt theme" end set -l theme $argv[1] - set -l theme_dir $__fish_config_dir/themes/$theme + set -l theme_dir $__fish_sysconf_dir/themes/$theme if not test -d $theme_dir echo "fish_load_theme: Theme '$theme' not found." >&2