mergederp

(auto-msg whatthecommit.com)

On branch main
Your branch is up to date with 'origin/main'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	modified:   nix/builder/default.nix
	modified:   nix/builder/nixCats.lua
	modified:   nix/nixCatsHelp/nixCats_format.txt
	modified:   nix/nixCatsHelp/nixCats_plugin.txt

nix/builder/default.nix

@@ -192,7 +192,7 @@ in
       vim.opt.packpath:remove(vim.g.configdir)
       vim.opt.runtimepath:remove(vim.g.configdir)
       vim.opt.runtimepath:remove(vim.g.configdir .. "/after")
-      vim.g.configdir = require('nixCats').get([[nixCats_store_config_location]])
+      vim.g.configdir = require('nixCats').get([[nixCats_config_location]])
       require('nixCats').addGlobals()
       vim.opt.packpath:prepend(vim.g.configdir)
       vim.opt.runtimepath:prepend(vim.g.configdir)
@@ -210,7 +210,7 @@ in
           (pkgs.lib.unique (filterAndFlatten optionalLuaAdditions));
     in/* lua */''
       ${optLuaPre}
-      vim.g.configdir = require('nixCats').get([[nixCats_store_config_location]])
+      vim.g.configdir = require('nixCats').get([[nixCats_config_location]])
       if vim.fn.filereadable(vim.g.configdir .. "/init.vim") == 1 then
         vim.cmd.source(vim.g.configdir .. "/init.vim")
       end

nix/builder/nixCats.lua

@@ -72,7 +72,7 @@ function M.addGlobals()
                 print(M.vimPackDir)
                 return
             elseif opts.fargs[1] == 'configDir' then
-                print(M.settings.nixCats_store_config_location)
+                print(M.settings.nixCats_config_location)
                 return
             elseif opts.fargs[1] == 'nixCatsPath' then
                 print(M.nixCatsPath)

nix/nixCatsHelp/nixCats_format.txt

@@ -32,7 +32,7 @@ But your lua config will be in the store.
 This is ok, because most of the reason for a plugin to use
 it would be to write to it, and we cant write to store paths anyway. 
 You could use `require('nixCats').configDir`,
-or `nixCats('nixCats_store_config_location')`
+or `nixCats('nixCats_config_location')`
 (yes its called store location, but it actually always
 points to the actual one being used)
 to get current config directory for your uses, if ever necessary.

nix/nixCatsHelp/nixCats_plugin.txt

@@ -124,7 +124,7 @@ will return something like this:
     markdown = true,
     neonixdev = true,
     nixCats_packageName = "nixCats",
-    nixCats_store_config_location = "/nix/store/fazkaci8bravyly4xahs0b69r1xxj4i3-nixCats-special-rtp-entry-LuaConfig",
+    nixCats_config_location = "/nix/store/fazkaci8bravyly4xahs0b69r1xxj4i3-nixCats-special-rtp-entry-LuaConfig",
     nixCats_wrapRc = true,
     test = {
       subtest1 = true