1 files changed, 24 insertions, 21 deletions
diff --git a/vim/autoload/xdg.vim b/vim/autoload/xdg.vim
index 9e6d6553..14aa3055 100644
--- a/vim/autoload/xdg.vim
+++ b/vim/autoload/xdg.vim
@@ -7,6 +7,8 @@ let s:defaults = {
       \ 'XDG_DATA_DIRS': '/usr/local/share/:/usr/share/',
       \}
 
+let s:subdir = 'vim'
+
 function! s:Get(name) abort
   let name = a:name
   let env = environ()
@@ -20,34 +22,35 @@ function! s:Get(name) abort
 endfunction
 
 function! s:Absolute(path) abort
-  return a:path !=# '^[/~]'
+  return a:path =~# '^[/~]'
 endfunction
 
-function! xdg#CacheDir(name) abort
-  let name = a:name
-  let home = s:Get('XDG_CACHE_HOME')
+function! s:Home(name) abort
+  let home = s:Get(a:name)
   if !s:Absolute(home)
-    return
+    return ''
   endif
-  return join([home, name], '/')
+  return join([home, s:subdir], '/')
 endfunction
 
-function! xdg#ConfigDirs(name) abort
-  let name = a:name
-  let home = s:Get('XDG_CONFIG_HOME')
-  let dirs = split(s:Get('XDG_CONFIG_DIRS'), ':')
+function! s:Dirs(name) abort
+  let dirs = split(s:Get(a:name), ':')
   return map(
-        \ filter(insert(dirs, home), 's:Absolute(v:val)')
-        \,'join([v:val, name], "/")'
+        \ filter(dirs, 's:Absolute(v:val)')
+        \,'join([v:val, s:subdir], "/")'
         \)
 endfunction
 
-function! xdg#DataDirs(name) abort
-  let name = a:name
-  let home = s:Get('XDG_DATA_HOME')
-  let dirs = split(s:Get('XDG_DATA_DIRS'), ':')
-  return map(
-        \ filter(insert(dirs, home), 's:Absolute(v:val)')
-        \,'join([v:val, name], "/")'
-        \)
-endfunction
+let xdg# = {
+      \ 'cache': {
+      \   'home': s:Home('XDG_CACHE_HOME'),
+      \ },
+      \ 'config': {
+      \   'home': s:Home('XDG_CONFIG_HOME'),
+      \   'dirs': s:Dirs('XDG_CONFIG_DIRS'),
+      \ },
+      \ 'data': {
+      \   'home': s:Home('XDG_DATA_HOME'),
+      \   'dirs': s:Dirs('XDG_DATA_DIRS'),
+      \ },
+      \}