feat: use dataDir in requirePaths

README.md

@@ -26,11 +26,6 @@ to make your life in a terminal easier.
 <img src="gallery/pillprompt.png">
 </div>
 
-# Links
-- **[Documentation](https://github.com/Hilbis/Hilbish/wiki)**
-- **[Gallery](https://github.com/Hilbis/Hilbish/discussions/36)** - See
-more screenshots of Hilbish in action
-
 # Installation
 **NOTE:** Hilbish is currently only officially supported and tested on Linux
 
@@ -58,6 +53,11 @@ Or from the latest `master` commit with:
 yay -S hilbish-git
 ```
 
+### Nixpkgs
+Nix/NixOS users can install Hilbish from the central repository, nixpkgs, through the usual ways.
+
+If you're new to nix you should probably read up on how to do that [here](https://nixos.wiki/wiki/Cheatsheet).
+
 ### Manual Build
 #### Prerequisites
 - [Go 1.16+](https://go.dev)

hilbish.go

@@ -39,7 +39,7 @@ func HilbishLoader(L *lua.LState) int {
 
 	xdg := L.NewTable()
 	L.SetField(xdg, "config", lua.LString(confDir))
-	L.SetField(xdg, "data", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share/")))
+	L.SetField(xdg, "data", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share")))
 	L.SetField(mod, "xdg", xdg)
 
 	util.Document(L, mod, "A miscellaneous sort of \"core\" API for things that relate to the shell itself and others.")

vars_linux.go

@@ -4,15 +4,15 @@ package main
 
 // String vars that are free to be changed at compile time
 var (
-	requirePaths = commonRequirePaths + `
+	requirePaths = commonRequirePaths + `.. ';'
-	.. ';/usr/share/hilbish/libs/?/init.lua;'
+	.. hilbish.dataDir .. '/libs/?/init.lua;'
-	.. ';/usr/share/hilbish/libs/?/?.lua;'` + linuxUserPaths
+	.. hilbish.dataDir .. '/libs/?/?.lua;'` + linuxUserPaths
 	linuxUserPaths = `
 	.. hilbish.xdg.data .. '/hilbish/libs/?/init.lua;'
 	.. hilbish.xdg.data	.. '/hilbish/libs/?/?.lua;'
-	.. hilbish.xdg.data	.. '/hilbish/libs/?.lua'
+	.. hilbish.xdg.data	.. '/hilbish/libs/?.lua;'
-	.. hilbish.xdg.config	.. '/hilbish/?/init.lua'
+	.. hilbish.xdg.config	.. '/hilbish/?/init.lua;'
-	.. hilbish.xdg.config	.. '/hilbish/?/?.lua'
+	.. hilbish.xdg.config	.. '/hilbish/?/?.lua;'
 	.. hilbish.xdg.config	.. '/hilbish/?.lua'`
 	dataDir = "/usr/share/hilbish"
 	preloadPath = dataDir + "/preload.lua"