From 823b6a79a8e23bbb5c3f41a6597cf75d70ed6e07 Mon Sep 17 00:00:00 2001 From: M4rk9696 Date: Sat, 8 Jun 2019 21:11:09 +0530 Subject: [PATCH 1/2] cli: list pkgs and themes from OMF_CONFIG --- pkg/omf/functions/packages/omf.packages.list.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/omf/functions/packages/omf.packages.list.fish b/pkg/omf/functions/packages/omf.packages.list.fish index f32fa21..c2b3f8e 100644 --- a/pkg/omf/functions/packages/omf.packages.list.fish +++ b/pkg/omf/functions/packages/omf.packages.list.fish @@ -14,8 +14,8 @@ function omf.packages.list -d 'List installed packages' set -e show_plugins end - set -l plugins_paths $OMF_PATH/pkg/* - set -l themes_paths $OMF_PATH/themes/* + set -l plugins_paths {$OMF_CONFIG, $OMF_PATH}/pkg/* + set -l themes_paths {$OMF_CONFIG, $OMF_PATH}/themes/* if set -q show_plugins for path in $plugins_paths From 62a051a201e535232c307f5bcd2d78e2ffee4c90 Mon Sep 17 00:00:00 2001 From: M4rk9696 Date: Sat, 8 Jun 2019 21:54:06 +0530 Subject: [PATCH 2/2] cli: Load theme from OMF_CONFIG #554 --- pkg/omf/functions/themes/omf.theme.set.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/omf/functions/themes/omf.theme.set.fish b/pkg/omf/functions/themes/omf.theme.set.fish index 0edd03f..40bc1e6 100644 --- a/pkg/omf/functions/themes/omf.theme.set.fish +++ b/pkg/omf/functions/themes/omf.theme.set.fish @@ -1,5 +1,5 @@ function omf.theme.set -a target_theme - if not test -d $OMF_PATH/themes/$target_theme + if not test -d $OMF_PATH/themes/$target_theme -o -d $OMF_CONFIG/themes/$target_theme return $OMF_INVALID_ARG end