require: fix conf.d support

Some time ago support for conf.d was added but it is currently broken if
the package does not have an `init.fish` file, given that `require`
enumerates packages through a glob on the existence of `init.fish`.

This fixes this requirement by globbing both `init.fish` and `conf.d`
entries in the `OMF_PATH`. This does generate duplicated entries, but
given that `require` already protects against double requires, this
should be safe.

lib/require.fish

@@ -30,8 +30,7 @@ function require
 
   set function_path $package_path/functions*
   set complete_path $package_path/completions*
-  set init_path $package_path/init.fish*
-  set conf_path $package_path/conf.d/*.fish
+  set init_path $package_path/{conf.d*,init.fish*}
 
   # Autoload functions
   test -n "$function_path"
@@ -72,17 +71,21 @@ function require
       end
     end
 
-    source $init $path
+    if test -f $path/init.fish
+      source $path/init.fish $path
+    end
+
+    for conf in $path/conf.d/*.fish
+      source $conf
+    end
 
     emit init_$package $path
 
     set -g omf_init_path $omf_init_path $path
+
     emit perf:timer:finish $init
   end
 
-  for conf in $conf_path
-    source $conf
-  end
 
   return 0
 end