1 files changed, 17 insertions, 15 deletions
diff --git a/users/seth/programs/vim.nix b/users/seth/programs/vim.nix
index 409e225..6f59fee 100644
--- a/users/seth/programs/vim.nix
+++ b/users/seth/programs/vim.nix
@@ -1,4 +1,6 @@
-{
+{config, ...}: let
+  inherit (config.xdg) configHome dataHome stateHome;
+in {
   programs.vim = {
     enable = true;
     settings = {
@@ -8,23 +10,23 @@
     };
     extraConfig = ''
       " https://wiki.archlinux.org/title/XDG_Base_Directory
-      set runtimepath^=$XDG_CONFIG_HOME/vim
-      set runtimepath+=$XDG_DATA_HOME/vim
-      set runtimepath+=$XDG_CONFIG_HOME/vim/after
+      set runtimepath^=${configHome}/vim
+      set runtimepath+=${dataHome}/vim
+      set runtimepath+=${configHome}/vim/after
 
-      set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
-      set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
-      set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
-      set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
+      set packpath^=${dataHome}/vim,${configHome}/vim
+      set packpath+=${configHome}/vim/after,${dataHome}/vim/after
+      set packpath^=${dataHome}/vim,${configHome}/vim
+      set packpath+=${configHome}/vim/after,${dataHome}/vim/after
 
-      let g:netrw_home = $XDG_DATA_HOME."/vim"
-      call mkdir($XDG_DATA_HOME."/vim/spell", 'p')
+      let g:netrw_home = ${dataHome}."/vim"
+      call mkdir(${dataHome}."/vim/spell", 'p')
 
-      set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p')
-      set directory=$XDG_STATE_HOME/vim/swap   | call mkdir(&directory, 'p')
-      set undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')
-      set viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')
-      set viminfofile=$XDG_STATE_HOME/vim/viminfo
+      set backupdir=${stateHome}/vim/backup | call mkdir(&backupdir, 'p')
+      set directory=${stateHome}/vim/swap   | call mkdir(&directory, 'p')
+      set undodir=${stateHome}/vim/undo     | call mkdir(&undodir,   'p')
+      set viewdir=${stateHome}/vim/view     | call mkdir(&viewdir,   'p')
+      set viminfofile=${stateHome}/vim/viminfo
     '';
   };
 }