feat: use dataDir in requirePaths

fix: remove / at the end of xdg data path
chore: fix merge conflict
2021-10-17 23:14:18 -04:00 · 2021-10-17 23:13:53 -04:00 · 2021-10-17 23:10:20 -04:00 · 2021-10-17 23:09:48 -04:00 · 2021-10-17 23:00:38 -04:00 · 2021-10-17 22:43:58 -04:00
3 changed files with 12 additions and 12 deletions
--- a/README.md
+++ b/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)
--- a/hilbish.go
+++ b/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.")
--- a/vars_linux.go
+++ b/vars_linux.go
@ -4,15 +4,15 @@ package main

 // String vars that are free to be changed at compile time
 var (
-	requirePaths = commonRequirePaths + `
-	.. ';/usr/share/hilbish/libs/?/init.lua;'
-	.. ';/usr/share/hilbish/libs/?/?.lua;'` + linuxUserPaths
+	requirePaths = commonRequirePaths + `.. ';'
+	.. hilbish.dataDir .. '/libs/?/init.lua;'
+	.. 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.config	.. '/hilbish/?/init.lua'
-	.. hilbish.xdg.config	.. '/hilbish/?/?.lua'
+	.. hilbish.xdg.data	.. '/hilbish/libs/?.lua;'
+	.. hilbish.xdg.config	.. '/hilbish/?/init.lua;'
+	.. hilbish.xdg.config	.. '/hilbish/?/?.lua;'
 	.. hilbish.xdg.config	.. '/hilbish/?.lua'`
 	dataDir = "/usr/share/hilbish"
 	preloadPath = dataDir + "/preload.lua"
Author	SHA1	Message	Date
sammyette	2cf979401b	feat: use dataDir in requirePaths	2021-10-17 23:14:18 -04:00
sammyette	87fcdd3c10	fix: remove / at the end of xdg data path	2021-10-17 23:13:53 -04:00
sammyette	9f523ba3c0	chore: fix merge conflict	2021-10-17 23:10:20 -04:00
sammyette	e08e3b9b94	fix: require paths	2021-10-17 23:09:48 -04:00
sammyette	00f41a95bc	fix: use dataDir var in requirePaths	2021-10-17 23:00:38 -04:00
sammyette	b1f4efd9ac	docs: remove links section	2021-10-17 22:43:58 -04:00
sammyette	212a52fd04	docs: fix link to nixos install info	2021-10-17 22:36:42 -04:00
legendofmiracles	0c7fadbaad	docs: add nix installation instructions (#78 )	2021-10-17 22:34:43 -04:00