Merge `$OMF_CONFIG` and `$OMF_CUSTOM`.
Per conversation with @bpinto in Gitter. There's no need for two separate directories. You don't have a `.git` and `.git-custom` folder, you just put your config in `.git` :) The most straightforward interpretation of XDG basedir spec is that user configuration for omf would go in `~/.config/omf`, so let's put it there. The only question is whether omf-generated config (i.e. the `theme` file) should go there as well. By analogy with git, programmatically generated config should probably be merged in with user config. This also makes it so when a user clones their dotfiles to a new machine, both kinds of settings come with it.pull/2/head
parent
e116608c01
commit
0359ba047c
@ -1,6 +1,6 @@
|
||||
# List all packages available to install from the registry.
|
||||
function omf_list_db_packages
|
||||
for item in (basename $OMF_PATH/db/pkg/*)
|
||||
contains $item (basename {$OMF_PATH,$OMF_CUSTOM}/pkg/*); or echo $item
|
||||
contains $item (basename {$OMF_PATH,$OMF_CONFIG}/pkg/*); or echo $item
|
||||
end
|
||||
end
|
||||
|
@ -1,6 +1,6 @@
|
||||
# List all custom packages and packages installed from the registry.
|
||||
function omf_list_local_packages
|
||||
for item in (basename {$OMF_PATH,$OMF_CUSTOM}/pkg/*)
|
||||
for item in (basename {$OMF_PATH,$OMF_CONFIG}/pkg/*)
|
||||
test $item = omf; or echo $item
|
||||
end
|
||||
end
|
||||
|
@ -1,10 +1,10 @@
|
||||
function omf_util_mkdir -a name
|
||||
set -l name "$argv[1]"
|
||||
if test -d "$OMF_CUSTOM"
|
||||
set name "$OMF_CUSTOM/$name"
|
||||
if test -d "$OMF_CONFIG"
|
||||
set name "$OMF_CONFIG/$name"
|
||||
else if test -d "$OMF_PATH"
|
||||
set name "$OMF_PATH/$name"
|
||||
end
|
||||
mkdir -p "$name"
|
||||
echo $name
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue