chore: merge from master

.github/workflows/website.yml

@@ -1,10 +1,8 @@
 name: Build website
 
 on:
-  push:
+  - push
-    branches:
+  - pull_request
-      - master
-      - docs-refactor
 
 jobs:
   deploy:
@@ -21,11 +19,29 @@ jobs:
           hugo-version: 'latest'
           extended: true
 
+      - name: Set branch name
+        id: branch
+        run: echo "::set-output name=BRANCH_NAME::${GITHUB_REF##*/}"
+
+      - name: Fix base URL
+        if: steps.branch.outputs.BRANCH_NAME != 'master' && github.repository_owner == 'Rosettea'      
+        run: sed -i "s%baseURL = 'https://rosettea.github.io/Hilbish/'%baseURL = 'https://rosettea.github.io/Hilbish/versions/${{ steps.branch.outputs.BRANCH_NAME }}'%" website/config.toml
+
       - name: Build
         run: 'cd website && hugo --minify'
 
       - name: Deploy
+        if: steps.branch.outputs.BRANCH_NAME == 'master' && github.repository_owner == 'Rosettea'
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./website/public
+          keep_files: true
+      - name: Deploy
+        if: steps.branch.outputs.BRANCH_NAME != 'master' && github.repository_owner == 'Rosettea'
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./website/public
+          destination_dir: versions/${{ steps.branch.outputs.BRANCH_NAME }}
+          keep_files: true

.hilbishrc.lua

@@ -1,18 +1,39 @@
 -- Default Hilbish config
+local hilbish = require 'hilbish'
 local lunacolors = require 'lunacolors'
 local bait = require 'bait'
 local ansikit = require 'ansikit'
 
+local unreadCount = 0
+local running = false
 local function doPrompt(fail)
 	hilbish.prompt(lunacolors.format(
 		'{blue}%u {cyan}%d ' .. (fail and '{red}' or '{green}') .. '∆ '
 	))
 end
 
+local function doNotifyPrompt()
+	if running or unreadCount == hilbish.messages.unreadCount() then return end
+
+	local notifPrompt = string.format('• %s unread notification%s', hilbish.messages.unreadCount(), hilbish.messages.unreadCount() > 1 and 's' or '')
+	unreadCount = hilbish.messages.unreadCount()
+	hilbish.prompt(lunacolors.blue(notifPrompt), 'right')
+
+	hilbish.timeout(function()
+		hilbish.prompt('', 'right')
+	end, 3000)
+end
+
 doPrompt()
 
+bait.catch('command.preexec', function()
+	running = true
+end)
+
 bait.catch('command.exit', function(code)
+	running = false
 	doPrompt(code ~= 0)
+	doNotifyPrompt()
 end)
 
 bait.catch('hilbish.vimMode', function(mode)
@@ -22,3 +43,7 @@ bait.catch('hilbish.vimMode', function(mode)
 		ansikit.cursorStyle(ansikit.lineCursor)
 	end
 end)
+
+bait.catch('hilbish.notification', function(notif)
+	doNotifyPrompt()
+end)

CHANGELOG.md

@@ -1,9 +1,32 @@
 # 🎀 Changelog
 
 ## Unreleased
+### Added
+- Made a few additions to the sink type:
+  - `read()` method for retrieving input (so now the `in` sink of commanders is useful)
+  - `flush()` and `autoFlush()` related to flushing outputs
+  - `pipe` property to check if a sink with input is a pipe (like stdin)
+- Add fuzzy search to history search (enable via `hilbish.opts.fuzzy = true`)
+- Show indexes on cdr list
+- `hilbish.messages` interface (details in [#219])
+- `hilbish.notification` signal when a message/notification is sent
+- `notifyJobFinish` opt to send a notification when background jobs are
+completed.
+
+[#219]: https://github.com/Rosettea/Hilbish/issues/219
 ### Fixed
 - Replaced `sed` in-place editing with `grep` and `mv` for compatibility with BSD utils
 
+## [2.1.2] - 2022-04-10
+### Removed
+- Bad april fools code ;(
+
+## [2.1.1] - 2022-04-01
+### Added
+- Validation checks for command input
+- Improved runtime performance
+- Validate Lua code
+
 ## [2.1.0] - 2022-02-10
 ### Added
 - Documented custom userdata types (Job and Timer Objects)

README.md

@@ -1,45 +1,35 @@
-<div align="center">
+<img src="./assets/hilbish-logo-and-text.png" width=512><br>
-	<img src="./assets/hilbish-flower.png" width=128><br>
+<blockquote>
-	<img src="./assets/hilbish-text.png" width=256><br>
+🌓 The Moon-powered shell! A comfy and extensible shell for Lua fans! 🌺 ✨
-	<blockquote>
+</blockquote>
-	🌺 The flower shell. A comfy and nice little shell for Lua fans!
-	</blockquote>
-	<p align="center">
-		<img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/Rosettea/Hilbish?style=flat-square">
-		<img alt="GitHub commits since latest release (by date)" src="https://img.shields.io/github/commits-since/Rosettea/Hilbish/latest?style=flat-square">
-		<img alt="GitHub contributors" src="https://img.shields.io/github/contributors/Rosettea/Hilbish?style=flat-square"><br>
-		<a href="https://github.com/Rosettea/Hilbish/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22"><img src="https://img.shields.io/github/issues/Hilbis/Hilbish/help%20wanted?style=flat-square&color=green" alt="help wanted"></a>
-		<a href="https://github.com/Rosettea/Hilbish/blob/master/LICENSE"><img alt="GitHub license" src="https://img.shields.io/github/license/Rosettea/Hilbish?style=flat-square"></a>
-		<a href="https://discord.gg/3PDdcQz"><img alt="Discord" src="https://img.shields.io/discord/732357621503229962?color=blue&style=flat-square"></a>
-	</p>
-</div>
 
-Hilbish is a extensible shell (framework). It was made to be very customizable
+<img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/Rosettea/Hilbish?style=flat-square"><img alt="GitHub commits since latest release (by date)" src="https://img.shields.io/github/commits-since/Rosettea/Hilbish/latest?style=flat-square"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/Rosettea/Hilbish?style=flat-square"><br>
-via the Lua programming language. It aims to be easy to use for the casual
+<a href="https://github.com/Rosettea/Hilbish/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22"><img src="https://img.shields.io/github/issues/Hilbis/Hilbish/help%20wanted?style=flat-square&color=green" alt="help wanted"></a>
-people but powerful for those who want to tinker more with their shell,
+<a href="https://github.com/Rosettea/Hilbish/blob/master/LICENSE"><img alt="GitHub license" src="https://img.shields.io/github/license/Rosettea/Hilbish?style=flat-square"></a>
-the thing used to interface with most of the system.  
+<a href="https://discord.gg/3PDdcQz"><img alt="Discord" src="https://img.shields.io/discord/732357621503229962?color=blue&style=flat-square"></a>
+<br>
+
+Hilbish is an extensible shell designed to be highly customizable.
+It is configured in Lua and provides a good range of features.
+It aims to be easy to use for anyone but powerful enough for
+those who need it.
 
 The motivation for choosing Lua was that its simpler and better to use
 than old shell script. It's fine for basic interactive shell uses,
 but that's the only place Hilbish has shell script; everything else is Lua
 and aims to be infinitely configurable. If something isn't, open an issue!
 
-# Table of Contents
-- [Screenshots](#Screenshots)
-- [Getting Hilbish](#Getting-Hilbish)
-- [Contributing](#Contributing)
-
 # Screenshots
 <div align="center">
-<img src="gallery/terminal.png"><br><br>
+<img src="gallery/tab.png">
-<img src="gallery/tab.png"><br><br>
 <img src="gallery/pillprompt.png">
 </div>
 
 # Getting Hilbish
 **NOTE:** Hilbish is not guaranteed to work properly on Windows, starting
 from the 2.0 version. It will still be able to compile, but functionality
-may be lacking.
+may be lacking. If you want to contribute to make the situation better,
+comment on the Windows discussion.
 
 You can check the [install page](https://rosettea.github.io/Hilbish/install/)
 on the website for distributed binaries from GitHub or other package repositories.

api.go

@@ -2,6 +2,7 @@
 // The Hilbish module includes the core API, containing
 // interfaces and functions which directly relate to shell functionality.
 // #field ver The version of Hilbish
+// #field goVersion The version of Go that Hilbish was compiled with
 // #field user Username of the user
 // #field host Hostname of the machine
 // #field dataDir Directory for Hilbish data files, including the docs and default modules
@@ -110,6 +111,7 @@ func hilbishLoad(rtm *rt.Runtime) (rt.Value, func()) {
 	}
 
 	util.SetFieldProtected(fakeMod, mod, "ver", rt.StringValue(getVersion()))
+	util.SetFieldProtected(fakeMod, mod, "goVersion", rt.StringValue(runtime.Version()))
 	util.SetFieldProtected(fakeMod, mod, "user", rt.StringValue(username))
 	util.SetFieldProtected(fakeMod, mod, "host", rt.StringValue(host))
 	util.SetFieldProtected(fakeMod, mod, "home", rt.StringValue(curuser.HomeDir))
@@ -642,6 +644,14 @@ func hlhinter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 // reality could set the input of the prompt to *display* anything. The
 // callback is passed the current line and is expected to return a line that
 // will be used as the input display.
+// Note that to set a highlighter, one has to override this function.
+// Example:
+// ```
+// function hilbish.highlighter(line)
+//    return line:gsub('"%w+"', function(c) return lunacolors.green(c) end)
+// end
+// ```
+// This code will highlight all double quoted strings in green.
 // --- @param line string
 func hlhighlighter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	return c.Next(), nil

docs/api/hilbish/_index.md

@@ -13,6 +13,7 @@ interfaces and functions which directly relate to shell functionality.
 
 ## Interface fields
 - `ver`: The version of Hilbish
+- `goVersion`: The version of Go that Hilbish was compiled with
 - `user`: Username of the user
 - `host`: Hostname of the machine
 - `dataDir`: Directory for Hilbish data files, including the docs and default modules
@@ -49,6 +50,14 @@ Line highlighter handler. This is mainly for syntax highlighting, but in
 reality could set the input of the prompt to *display* anything. The
 callback is passed the current line and is expected to return a line that
 will be used as the input display.
+Note that to set a highlighter, one has to override this function.
+Example:
+```
+function hilbish.highlighter(line)
+   return line:gsub('"%w+"', function(c) return lunacolors.green(c) end)
+end
+```
+This code will highlight all double quoted strings in green.
 
 ### hinter(line, pos)
 The command line hint handler. It gets called on every key insert to
@@ -109,6 +118,16 @@ A sink is a structure that has input and/or output to/from
 a desination.
 
 ### Methods
+#### autoFlush(auto)
+Sets/toggles the option of automatically flushing output.
+A call with no argument will toggle the value.
+
+#### flush()
+Flush writes all buffered input to the sink.
+
+#### read() -> string
+Reads input from the sink.
+
 #### write(str)
 Writes data to a sink.
 

docs/hooks/command.md

@@ -1,3 +1,8 @@
++ `command.preexec` -> input, cmdStr > Thrown before a command
+is executed. The `input` is the user written command, while `cmdStr`
+is what will be executed (`input` will have aliases while `cmdStr`
+will have alias resolved input).
+
 + `command.exit` -> code, cmdStr > Thrown when a command exits.
 `code` is the exit code of the command, and `cmdStr` is the command that was run.
 

docs/hooks/hilbish.md

@@ -7,3 +7,6 @@
 like yanking or pasting text. See `doc vim-mode actions` for more info.
 
 + `hilbish.cancel` > Sent when the user cancels their input with Ctrl-C.
+
++ `hilbish.notification` -> message > Sent when a message is
+sent.

emmyLuaDocs/hilbish.lua

@@ -79,6 +79,14 @@ function hilbish.goro(fn) end
 --- reality could set the input of the prompt to *display* anything. The
 --- callback is passed the current line and is expected to return a line that
 --- will be used as the input display.
+--- Note that to set a highlighter, one has to override this function.
+--- Example:
+--- ```
+--- function hilbish.highlighter(line)
+---    return line:gsub('"%w+"', function(c) return lunacolors.green(c) end)
+--- end
+--- ```
+--- This code will highlight all double quoted strings in green.
 --- @param line string
 function hilbish.highlighter(line) end
 
@@ -180,6 +188,18 @@ function hilbish.jobs:foreground() end
 --- @param cmd string
 function hilbish.runner.lua(cmd) end
 
+--- Sets/toggles the option of automatically flushing output.
+--- A call with no argument will toggle the value.
+--- @param auto boolean|nil
+function hilbish:autoFlush(auto) end
+
+--- Flush writes all buffered input to the sink.
+function hilbish:flush() end
+
+--- Reads input from the sink.
+--- @returns string
+function hilbish:read() end
+
 --- Writes data to a sink.
 function hilbish:write(str) end
 

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/blackfireio/osinfo v1.0.3
 	github.com/maxlandon/readline v0.1.0-beta.0.20211027085530-2b76cabb8036
 	github.com/pborman/getopt v1.1.0
+	github.com/sahilm/fuzzy v0.1.0
 	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
 	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171
 	mvdan.cc/sh/v3 v3.5.1
@@ -16,6 +17,7 @@ require (
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/arnodel/strftime v0.1.6 // indirect
 	github.com/evilsocket/islazy v1.10.6 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/olekukonko/ts v0.0.0-20171002115256-78ecb04241c0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect

go.sum

@@ -26,6 +26,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/olekukonko/ts v0.0.0-20171002115256-78ecb04241c0 h1:LiZB1h0GIcudcDci2bxbqI6DXV8bF8POAnArqvRrIyw=
@@ -39,6 +41,8 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.1-0.20210923151022-86f73c517451 h1:d1PiN4RxzIFXCJTvRkvSkKqwtRAl5ZV4lATKtQI0B7I=
 github.com/rogpeppe/go-internal v1.8.1-0.20210923151022-86f73c517451/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
+github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 h1:w8s32wxx3sY+OjLlv9qltkLU5yvJzxjjgiHWLjdIcw4=
 golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

lua.go

@@ -68,7 +68,7 @@ func luaInit() {
 	}
 
 	// Add more paths that Lua can require from
-	err := util.DoString(l, "package.path = package.path .. " + requirePaths)
+	_, err := util.DoString(l, "package.path = package.path .. " + requirePaths)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Could not add Hilbish require paths! Libraries will be missing. This shouldn't happen.")
 	}

main.go

@@ -106,7 +106,7 @@ func main() {
 	}
 
 	if *verflag {
-		fmt.Printf("Hilbish %s\n", getVersion())
+		fmt.Printf("Hilbish %s\nCompiled with %s\n", getVersion(), runtime.Version())
 		os.Exit(0)
 	}
 

nature/commands/cdr.lua

@@ -10,7 +10,7 @@ cdr: change directory to one which has been recently visied
 
 usage: cdr <index>
 
-to get a list of recent directories, use {green}{underline}cdr list{reset}]])
+to get a list of recent directories, use {green}cdr list{reset}]])
 		return
 	end
 
@@ -20,7 +20,10 @@ to get a list of recent directories, use {green}{underline}cdr list{reset}]])
 			sinks.out:writeln 'No directories have been visited.'
 			return 1
 		end
-		sinks.out:writeln(table.concat(recentDirs, '\n'))
+		for idx, d in ipairs(dirs.recentDirs) do
+			if d:find(hilbish.home, 1, true) then d = fs.join('~', d:sub(hilbish.home:len() + 1)) end
+			sinks.out:writeln(lunacolors.format(string.format('{cyan}%d{reset} %s', idx, d)))
+		end
 		return
 	end
 

nature/hummingbird.lua

@@ -0,0 +1,84 @@
+local bait = require 'bait'
+local commander = require 'commander'
+local lunacolors = require 'lunacolors'
+
+local M = {}
+local counter = 0
+local unread = 0
+M._messages = {}
+M.icons = {
+	INFO = '',
+	SUCCESS = '',
+	WARN = '',
+	ERROR = ''
+}
+
+hilbish.messages = {}
+
+--- Represents a Hilbish message.
+--- @class hilbish.message
+--- @field icon string Unicode (preferably standard emoji) icon for the message notification.
+--- @field title string Title of the message (like an email subject).
+--- @field text string Contents of the message.
+--- @field channel string Short identifier of the message. `hilbish` and `hilbish.*` is preserved for internal Hilbish messages.
+--- @field summary string A short summary of the message.
+--- @field read boolean Whether the full message has been read or not.
+
+function expect(tbl, field)
+	if not tbl[field] or tbl[field] == '' then
+		error(string.format('expected field %s in message'))
+	end
+end
+
+--- Sends a message.
+--- @param message hilbish.message
+function hilbish.messages.send(message)
+	expect(message, 'text')
+	expect(message, 'title')
+	counter = counter + 1
+	unread = unread + 1
+	message.index = counter
+	message.read = false
+
+	M._messages[message.index] = message
+	bait.throw('hilbish.notification', message)
+end
+
+function hilbish.messages.read(idx)
+	local msg = M._messages[idx]
+	if msg then
+		M._messages[idx].read = true
+		unread = unread - 1
+	end
+end
+
+function hilbish.messages.readAll(idx)
+	for _, msg in ipairs(hilbish.messages.all()) do
+		hilbish.messages.read(msg.index)
+	end
+end
+
+function hilbish.messages.unreadCount()
+	return unread
+end
+
+function hilbish.messages.delete(idx)
+	local msg = M._messages[idx]
+	if not msg then
+		error(string.format('invalid message index %d', idx or -1))
+	end
+
+	M._messages[idx] = nil
+end
+
+function hilbish.messages.clear()
+	for _, msg in ipairs(hilbish.messages.all()) do
+		hilbish.messages.delete(msg.index)
+	end
+end
+
+function hilbish.messages.all()
+	return M._messages
+end
+
+return M

nature/init.lua

@@ -11,6 +11,7 @@ require 'nature.completions'
 require 'nature.opts'
 require 'nature.vim'
 require 'nature.runner'
+require 'nature.hummingbird'
 
 local shlvl = tonumber(os.getenv 'SHLVL')
 if shlvl ~= nil then

nature/opts/init.lua

@@ -16,7 +16,7 @@ setmetatable(hilbish.opts, {
 
 local function setupOpt(name, default)
 	opts[name] = default
-	require('nature.opts.' .. name)
+	pcall(require, 'nature.opts.' .. name)
 end
 
 local defaultOpts = {
@@ -25,7 +25,9 @@ local defaultOpts = {
 	greeting = string.format([[Welcome to {magenta}Hilbish{reset}, {cyan}%s{reset}.
 The nice lil shell for {blue}Lua{reset} fanatics!
 ]], hilbish.user),
-	motd = true
+	motd = true,
+	fuzzy = false,
+	notifyJobFinish = true
 }
 
 for optsName, default in pairs(defaultOpts) do

nature/opts/notifyJobFinish.lua

@@ -0,0 +1,23 @@
+local bait = require 'bait'
+local lunacolors = require 'lunacolors'
+
+bait.catch('job.done', function(job)
+	if not hilbish.opts.notifyJobFinish then return end
+	local notifText = string.format(lunacolors.format [[
+Background job with ID#%d has exited (PID %d).
+Command string: {bold}{yellow}%s{reset}]], job.id, job.pid, job.cmd)
+
+	if job.stdout ~= '' then
+		notifText = notifText .. '\n\nStandard output:\n' .. job.stdout
+	end
+	if job.stderr ~= '' then
+		notifText = notifText .. '\n\nStandard error:\n' .. job.stderr
+	end
+
+	hilbish.messages.send {
+		channel = 'jobNotify',
+		title = string.format('Job ID#%d Exited', job.id),
+		summary = string.format(lunacolors.format 'Background job with command {bold}{yellow}%s{reset} has finished running!', job.cmd),
+		text = notifText
+	}
+end)

readline/comp-group.go

@@ -71,10 +71,9 @@ func (g *CompletionGroup) init(rl *Instance) {
 // The rx parameter is passed, as the shell already checked that the search pattern is valid.
 func (g *CompletionGroup) updateTabFind(rl *Instance) {
 
-	suggs := make([]string, 0)
+	suggs := rl.Searcher(rl.search, g.Suggestions)
-
 	// We perform filter right here, so we create a new completion group, and populate it with our results.
-	for i := range g.Suggestions {
+	/*for i := range g.Suggestions {
 		if rl.regexSearch == nil { continue }
 		if rl.regexSearch.MatchString(g.Suggestions[i]) {
 			suggs = append(suggs, g.Suggestions[i])
@@ -82,7 +81,7 @@ func (g *CompletionGroup) updateTabFind(rl *Instance) {
 			// this is a list so lets also check the descriptions
 			suggs = append(suggs, g.Suggestions[i])
 		}
-	}
+	}*/
 
 	// We overwrite the group's items, (will be refreshed as soon as something is typed in the search)
 	g.Suggestions = suggs

readline/instance.go

@@ -112,8 +112,10 @@ type Instance struct {
 	modeAutoFind bool           // for when invoked via ^R or ^F outside of [tab]
 	searchMode   FindMode       // Used for varying hints, and underlying functions called
 	regexSearch  *regexp.Regexp // Holds the current search regex match
+	search       string
 	mainHist     bool           // Which history stdin do we want
 	histInfo     []rune         // We store a piece of hist info, for dual history sources
+	Searcher func(string, []string) []string
 
 	//
 	// History -----------------------------------------------------------------------------------
@@ -229,6 +231,25 @@ func NewInstance() *Instance {
 	rl.HintFormatting = "\x1b[2m"
 	rl.evtKeyPress = make(map[string]func(string, []rune, int) *EventReturn)
 	rl.TempDirectory = os.TempDir()
+	rl.Searcher = func(needle string, haystack []string) []string {
+		suggs := make([]string, 0)
+
+		var err error
+		rl.regexSearch, err = regexp.Compile("(?i)" + string(rl.tfLine))
+		if err != nil {
+			rl.RefreshPromptLog(err.Error())
+			rl.infoText = []rune(Red("Failed to match search regexp"))
+		}
+
+		for _, hay := range haystack {
+			if rl.regexSearch == nil { continue }
+			if rl.regexSearch.MatchString(hay) {
+				suggs = append(suggs, hay)
+			}
+		}
+
+		return suggs
+	}
 
 	// Registers
 	rl.initRegisters()

readline/tab.go

@@ -94,7 +94,7 @@ func (rl *Instance) getTabSearchCompletion() {
 	rl.getCurrentGroup()
 
 	// Set the info for this completion mode
-	rl.infoText = append([]rune("Completion search: "), rl.tfLine...)
+	rl.infoText = append([]rune("Completion search: " + UNDERLINE + BOLD), rl.tfLine...)
 
 	for _, g := range rl.tcGroups {
 		g.updateTabFind(rl)
@@ -102,7 +102,7 @@ func (rl *Instance) getTabSearchCompletion() {
 
 	// If total number of matches is zero, we directly change the info, and return
 	if comps, _, _ := rl.getCompletionCount(); comps == 0 {
-		rl.infoText = append(rl.infoText, []rune(DIM+RED+" ! no matches (Ctrl-G/Esc to cancel)"+RESET)...)
+		rl.infoText = append(rl.infoText, []rune(RESET+DIM+RED+" ! no matches (Ctrl-G/Esc to cancel)"+RESET)...)
 	}
 }
 

readline/tabfind.go

@@ -1,9 +1,5 @@
 package readline
 
-import (
-	"regexp"
-)
-
 // FindMode defines how the autocomplete suggestions display
 type FindMode int
 
@@ -30,12 +26,7 @@ func (rl *Instance) updateTabFind(r []rune) {
 	rl.tfLine = append(rl.tfLine, r...)
 
 	// The search regex is common to all search modes
-	var err error
+	rl.search = string(rl.tfLine)
-	rl.regexSearch, err = regexp.Compile("(?i)" + string(rl.tfLine))
-	if err != nil {
-		rl.RefreshPromptLog(err.Error())
-		rl.infoText = []rune(Red("Failed to match search regexp"))
-	}
 
 	// We update and print
 	rl.clearHelpers()

readline/tui-effects.go

@@ -14,6 +14,7 @@ var (
 	// effects
 	BOLD  = "\033[1m"
 	DIM   = "\033[2m"
+	UNDERLINE   = "\033[4m"
 	RESET = "\033[0m"
 	// colors
 	RED    = "\033[31m"

rl.go

@@ -7,8 +7,9 @@ import (
 
 	"hilbish/util"
 
-	"github.com/maxlandon/readline"
 	rt "github.com/arnodel/golua/runtime"
+	"github.com/maxlandon/readline"
+	"github.com/sahilm/fuzzy"
 )
 
 type lineReader struct {
@@ -24,6 +25,24 @@ func newLineReader(prompt string, noHist bool) *lineReader {
 		rl: rl,
 	}
 
+	regexSearcher := rl.Searcher
+	rl.Searcher = func(needle string, haystack []string) []string {
+		fz, _ := util.DoString(l, "return hilbish.opts.fuzzy")
+		fuzz, ok := fz.TryBool()
+		if !fuzz || !ok {
+			return regexSearcher(needle, haystack)
+		}
+
+		matches := fuzzy.Find(needle, haystack)
+		suggs := make([]string, 0)
+
+		for _, match := range matches {
+			suggs = append(suggs, match.Str)
+		}
+
+		return suggs
+	}
+
 	// we don't mind hilbish.read rl instances having completion,
 	// but it cant have shared history
 	if !noHist {

sink.go

@@ -1,8 +1,10 @@
 package main
 
 import (
+	"bufio"
 	"fmt"
 	"io"
+	"os"
 
 	"hilbish/util"
 
@@ -15,9 +17,11 @@ var sinkMetaKey = rt.StringValue("hshsink")
 // A sink is a structure that has input and/or output to/from
 // a desination.
 type sink struct{
-	writer io.Writer
+	writer *bufio.Writer
-	reader io.Reader
+	reader *bufio.Reader
+	file *os.File
 	ud *rt.UserData
+	autoFlush bool
 }
 
 func setupSinkType(rtm *rt.Runtime) {
@@ -25,15 +29,35 @@ func setupSinkType(rtm *rt.Runtime) {
 
 	sinkMethods := rt.NewTable()
 	sinkFuncs := map[string]util.LuaExport{
+		"flush": {luaSinkFlush, 1, false},
+		"read": {luaSinkRead, 1, false},
+		"autoFlush": {luaSinkAutoFlush, 2, false},
 		"write": {luaSinkWrite, 2, false},
 		"writeln": {luaSinkWriteln, 2, false},
 	}
 	util.SetExports(l, sinkMethods, sinkFuncs)
 
 	sinkIndex := func(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
+		s, _ := sinkArg(c, 0)
+
 		arg := c.Arg(1)
 		val := sinkMethods.Get(arg)
 
+		if val != rt.NilValue {
+			return c.PushingNext1(t.Runtime, val), nil
+		}
+
+		keyStr, _ := arg.TryString()
+
+		switch keyStr {
+			case "pipe":
+				val = rt.BoolValue(false)
+				if s.file != nil {
+					fileInfo, _ := s.file.Stat();
+					val = rt.BoolValue(fileInfo.Mode() & os.ModeCharDevice == 0)
+				}
+		}
+
 		return c.PushingNext1(t.Runtime, val), nil
 	}
 
@@ -41,6 +65,25 @@ func setupSinkType(rtm *rt.Runtime) {
 	l.SetRegistry(sinkMetaKey, rt.TableValue(sinkMeta))
 }
 
+// #member
+// read() -> string
+// --- @returns string
+// Reads input from the sink.
+func luaSinkRead(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
+	if err := c.Check1Arg(); err != nil {
+		return nil, err
+	}
+
+	s, err := sinkArg(c, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	str, _ := s.reader.ReadString('\n')
+
+	return c.PushingNext1(t.Runtime, rt.StringValue(str)), nil
+}
+
 // #member
 // write(str)
 // Writes data to a sink.
@@ -59,6 +102,9 @@ func luaSinkWrite(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	}
 
 	s.writer.Write([]byte(data))
+	if s.autoFlush {
+		s.writer.Flush()
+	}
 
 	return c.Next(), nil
 }
@@ -81,22 +127,74 @@ func luaSinkWriteln(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	}
 
 	s.writer.Write([]byte(data + "\n"))
+	if s.autoFlush {
+		s.writer.Flush()
+	}
+
+	return c.Next(), nil
+}
+
+// #member
+// flush()
+// Flush writes all buffered input to the sink.
+func luaSinkFlush(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
+	if err := c.Check1Arg(); err != nil {
+		return nil, err
+	}
+
+	s, err := sinkArg(c, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	s.writer.Flush()
+
+	return c.Next(), nil
+}
+
+// #member
+// autoFlush(auto)
+// Sets/toggles the option of automatically flushing output.
+// A call with no argument will toggle the value.
+// --- @param auto boolean|nil
+func luaSinkAutoFlush(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
+	s, err := sinkArg(c, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	v := c.Arg(1)
+	if v.Type() != rt.BoolType && v.Type() != rt.NilType {
+		return nil, fmt.Errorf("#1 must be a boolean")
+	}
+
+	value := !s.autoFlush
+	if v.Type() == rt.BoolType {
+		value = v.AsBool()
+	}
+
+	s.autoFlush = value
 
 	return c.Next(), nil
 }
 
 func newSinkInput(r io.Reader) *sink {
 	s := &sink{
-		reader: r,
+		reader: bufio.NewReader(r),
 	}
 	s.ud = sinkUserData(s)
 
+	if f, ok := r.(*os.File); ok {
+		s.file = f
+	}
+
 	return s
 }
 
 func newSinkOutput(w io.Writer) *sink {
 	s := &sink{
-		writer: w,
+		writer: bufio.NewWriter(w),
+		autoFlush: true,
 	}
 	s.ud = sinkUserData(s)
 

util/util.go

@@ -26,13 +26,14 @@ func SetFieldProtected(module, realModule *rt.Table, field string, value rt.Valu
 }
 
 // DoString runs the code string in the Lua runtime.
-func DoString(rtm *rt.Runtime, code string) error {
+func DoString(rtm *rt.Runtime, code string) (rt.Value, error) {
 	chunk, err := rtm.CompileAndLoadLuaChunk("<string>", []byte(code), rt.TableValue(rtm.GlobalEnv()))
+	var ret rt.Value
 	if chunk != nil {
-		_, err = rt.Call1(rtm.MainThread(), rt.FunctionValue(chunk))
+		ret, err = rt.Call1(rtm.MainThread(), rt.FunctionValue(chunk))
 	}
 
-	return err
+	return ret, err
 }
 
 // DoFile runs the contents of the file in the Lua runtime.

vars.go

@@ -13,6 +13,7 @@ var (
 var (
 	ver = "v2.2.0"
 	releaseName = "Poppy"
+
 	gitCommit string
 	gitBranch string
 )

website/content/_index.md

@@ -8,11 +8,11 @@ description: 'Something Unique. Hilbish is the new interactive shell for Lua fan
 <div class="text-center">
 	<h1 class="fw-light">Something Unique.</h1>
 		<p>
-			<strong>Hilbish</strong> is the new interactive shell for Lua fans.<br>
+			<strong>🌺 Hilbish</strong> is the new Moon-powered interactive shell for Lua fans!<br>
-			Extensible, scriptable, configurable: All in Lua.
+			Extensible, scriptable, configurable: All in Lua. ✨
 		</p>
 	<a href="install" class="btn btn-primary">Install</a>
-	<a href="https://github.com/Rosettea/Hilbish" class="btn btn-secondary" target="_blank">Github</a>
+	<a href="https://github.com/Rosettea/Hilbish" class="btn btn-secondary" target="_blank">GitHub</a>
 </div>
 
 <hr>
@@ -108,14 +108,28 @@ description: 'Something Unique. Hilbish is the new interactive shell for Lua fan
 
 <hr>
 
+<h1 class="fw-light">Screenshots</h1>
+<div class="row row-cols-1 row-cols-md-2 g-4">
+	<div class="col">
+		<img src="/Hilbish/pillprompt.png">
+	</div>
+	<div class="col">
+		<img src="/Hilbish/default.png">
+	</div>
+	<div class="col">
+		<img src="/Hilbish/tab.png">
+	</div>
+</div>
+<br>
+
 <h1 class="fw-light">Why not just Lua?</h1>
 <p>
 	Hilbish is your interactive shell as well as a just a Lua interpreter
 	and enhanced REPL.<br>
 </p>
-<ul class="list-group" style="max-width: 64em;">
+<ul class="list-group">
 	<li class="list-group-item"><i class="fa-solid fa-battery-full"></i> Batteries included Lua runtime that's also your user shell!</li>
-	<li class="list-group-item"><i class="fa-solid fa-network-wired"></i> Hilbish is easily cross platform. It has OS agnostic interfaces for easy cross platform Lua code.</li>
+	<li class="list-group-item"><i class="fa-solid fa-network-wired"></i> Provides cross-platform and OS agnostic APIs to ensure your Lua code works everywhere Hilbish does, as expected.</li>
 </ul>
 
 <hr>
@@ -123,11 +137,10 @@ description: 'Something Unique. Hilbish is the new interactive shell for Lua fan
 <h1 class="fw-light">Try It Today!</h1>
 <p>
 	Hilbish is known to run on the 3 major platforms (Windows, MacOS, Linux)
-	but likely builds on other Unixes!
+	but likely builds on other Unixes! Windows doesn't work as well as it should,
-	<br>
+	so if you're a Windows user,
-	Windows doesn't work as well as it should, so if you're a Windows user,
 	<a href="https://github.com/Rosettea/Hilbish/discussions/165">say something</a>!
-	<ul class="list-group" style="max-width: 64em;">
+	<ul class="list-group">
 		<li class="list-group-item"><i class="fa-solid fa-cloud-arrow-down"></i> <a href="/Hilbish/install" style="text-decoration: none;"><strong>Download</strong></a> the binary</li>
 		<li class="list-group-item"><i class="fa-solid fa-screwdriver-wrench"></i> <a href="https://github.com/Rosettea/Hilbish#manual-build" style="text-decoration: none;"><strong>Build</strong></a> from source</li>
 	</ul>

website/content/blog/improving-this-website.md

@@ -0,0 +1,66 @@
+---
+title: "Improving Hilbish's Branding"
+date: 2023-04-13T22:15:31-04:00
+draft: false
+---
+
+Happy birthday Hilbish! As of last month, Hilbish is now 2 years old.
+Unfortunately I missed the official date, but I will still make a more
+focused post on the date (19st).
+
+I decided to fix up this website and Hilbish's logo, so that can
+be thought of as something for the 2 years milestone?
+
+# Logo
+Hilbish's old logo was.. not that good. It definitely functioned
+as a logo, but the yellow part of it looked ugly (sorry old logo).
+
+<img src="https://safe.kashima.moe/4c6e9q484pcy.png" width=256>
+<br>
+
+You would have definitely seen the new logo, since it is currently
+in use on the navigation bar and footer. Here it is in a bigger view:
+	
+<img src="https://safe.kashima.moe/oy72vpev2yi4.png" width=256>
+<br>
+	
+# Website
+Ever since this website was first made, from the release of v2.0, it has
+been doing it's job of being a website good enough, but there were a few issues.
+
+# Padding
+Padding is very important! The edges of your screen need space to do nothing,
+after all. On mobile or screens small enough, there would not be enough space
+for the auto margin to fill, and since there was no padding besides that,
+it means things would look a bit cramped. This was simple to fix.
+
+Here it is before:  
+![Before](https://safe.kashima.moe/nupzzalt2oa4.png)
+
+and after:  
+![After](https://safe.kashima.moe/r0ox4nazfi0q.png)
+
+# Docs Navigation
+On the docs page, the pages are on the left on desktop. Since
+phones are too small to have this content on the side, it stays at the top.
+This is a bit counter intuitive since it brings in extra scrolling
+when navigating to every page for docs and just doesn't look that good.
+
+A few months ago I made it collapse with the site wide navigation, but it
+was not hidden by default. So a few improvements were made:
+- Make the doc navigation hidden by default on mobile, just like site wide navigation
+- Make doc navigation have the same look as site wide navigation
+
+Here's a before:  
+![](https://safe.kashima.moe/krn0a6qwegdj.png)
+
+and after:  
+![](https://safe.kashima.moe/sk11ighz47yb.png)
+
+Looks a lot better now.
+
+# Other Changes
+If you haven't noticed, I have made other changes to the website.
+This includes:
+- Borders! Something this simple makes the website look a lot better, especially on mobile.
+- More padding and margin everywhere. Home, doc pages, blog post listing.

website/content/blog/v2.1.1-release.md

@@ -0,0 +1,38 @@
+---
+title: "v2.1.1 Release"
+date: 2023-04-01T18:15:42-04:00
+draft: false
+---
+
+> The release with full changelogs and prebuilt binaries can be
+seen at the [v2.1.1](https://github.com/Rosettea/Hilbish/releases/tag/v2.1.1)
+tag.
+
+Welcome to a fresh new release of Hilbish! Some people (or none) may be awaiting
+the long coming v2.2 release with lots of features, but I *needed* to push
+out this little bug fix (wink) release.
+
+# Bug Fixes
+## Validation checks for command input
+When running this version, you may have noticed an odd message that sometimes
+comes up when running commands. This is from the new TMOLI42SH
+(The Meaning of Life is 42 String Hash) input validation scheme.
+
+## Improved runtime code
+Commands now have a chance of taking exactly 2-3s ~~more~~ less time of running due to
+improvements in the code for shell runners!!!!!
+
+## Validate lua code
+Hilbish already threw an error when Lua code was not valid in syntax, but there was the
+need for an extra validation scheme (called OpTTCLC - Opinion based Turing Test to Check Lua Code)
+which results in less time wasted running invalid and TERRIBLE Lua code.
+
+# Features
+There is only 1 new feature in this glorious release.
+
+## Fix your mistakes for the future
+If you run a command that does not exist, Hilbish will say goodbye.
+
+# Closing
+Hope you enjoy this new release! It took a lot of effort to create this new version
+while I was busy doing completely nothing. :)))

website/content/blog/v2.1.2-release.md

@@ -0,0 +1,15 @@
+---
+title: "v2.1.2 Release"
+date: 2023-04-10T12:27:41-04:00
+draft: false
+---
+
+> The release with full changelogs and prebuilt binaries can be
+seen at the [v2.1.2](https://github.com/Rosettea/Hilbish/releases/tag/v2.1.2)
+tag.
+
+This release reverts the April Fool's code additions in v2.1.1. It is
+functionally equal to v2.1.0. Nice!
+
+A real release will come possibly in a few days or next week, so stay tuned for
+the good and feature-filled release of v2.2!

website/content/docs/features/_index.md

@@ -5,7 +5,7 @@ weight: -40
 menu: docs
 ---
 
-Hilbish has a wide range of features to enhance the user's experience and
+Hilbish has a wide range of features to enhance the user's experience 
-is always adding new ones. If there is something missing here or something
+new ones are always being added. If there is something missing here or
-you would like to see, please [start a discussion](https://github.com/Rosettea/Hilbish/discussions)
+something you would like to see, please [start a discussion](https://github.com/Rosettea/Hilbish/discussions)
 or comment on any existing ones which match your request.

website/content/docs/features/notifications.md

@@ -0,0 +1,39 @@
+---
+title: Notification
+description: Get notified of shell actions.
+layout: doc
+menu: 
+  docs:
+    parent: "Features"
+---
+
+Hilbish features a simple notification system which can be
+used by other plugins and parts of the shell to notify the user
+of various actions. This is used via the `hilbish.message` interface.
+
+A `message` is defined as a table with the following properties:
+- `icon`: A unicode/emoji icon for the notification.
+- `title`: The title of the message
+- `text`: Message text/body
+- `channel`: The source of the message. This should be a
+unique and easily readable text identifier.
+- `summary`: A short summary of the notification and message.
+If this is not present and you are using this to display messages,
+you should take part of the `text` instead.
+
+The `hilbish.message` interface provides the following functions:
+- `send(message)`: Sends a message and emits the `hilbish.notification`
+signal. DO NOT emit the `hilbish.notification` signal directly, or
+the message will not be stored by the message handler.
+- `read(idx)`: Marks message at `idx` as read.
+- `delete(idx)`: Removes message at `idx`.
+- `readAll()`: Marks all messages as read.
+- `clear()`: Deletes all messages.
+
+There are a few simple use cases of this notification/messaging system.
+It could also be used as some "inter-shell" messaging system (???) but
+is intended to display to users.
+
+An example is notifying users of completed jobs/commands ran in the background.
+Any Hilbish-native command (think the upcoming Greenhouse pager) can display
+it.

website/content/docs/features/runner-mode.md

@@ -15,3 +15,7 @@ In some cases, someone might want to switch to just shell script to avoid
 it while interactive but still have a Lua config, or go full Lua to use
 Hilbish as a REPL. This also allows users to add alternative languages,
 instead of either like Fennel.
+
+Runner mode can also be used to handle specific kinds of input before
+evaluating like normal, which is how [Link.hsh](https://github.com/TorchedSammy/Link.hsh)
+handles links.

website/content/docs/getting-started.md

@@ -15,9 +15,10 @@ To exit, you can either run the `exit` command or hit Ctrl+D.
 There are a few ways to make Hilbish your default shell. A simple way is 
 to make it your user/login shell.
 
-{{< warning `It is not recommended to set Hilbish as your login shell. That is expected to be a 
+{{< warning `It is not recommended to set Hilbish as your login shell. That
-POSIX compliant shell, which Hilbish is not. At most, there will just be a 
+is expected to be a POSIX compliant shell, which Hilbish is not. Though if
-few variables missing in your environment` >}}
+you still decide to do it, there will just be a few variables missing in
+your environment` >}}
 
 To do that, simply run `chsh -s /usr/bin/hilbish`.
 Some distros (namely Fedora) might have `lchsh` instead, which is used like `lchsh <user>`.

website/content/install.md

@@ -15,7 +15,12 @@ have breaking changes.
 For the latest **stable release**, check here: https://github.com/Rosettea/Hilbish/releases/latest  
 For a **development build**: https://nightly.link/Rosettea/Hilbish/workflows/build/master
 
+## Compiling
+To read the steps for compiling Hilbish, head over to the [GitHub repository.](https://github.com/Rosettea/Hilbish#build)
+
 ## Package Repositories
+Methods of installing Hilbish for your Linux distro.
+
 ### Fedora (COPR)
 An official COPR is offered to install Hilbish easily on Fedora.
 Enable the repo:

website/themes/hsh/layouts/_default/doc.html

@@ -1,8 +1,17 @@
 {{ define "main" }}
-<div class="container py-3 row">
+	<style>
-	<div class="container" style="width: 240px;">
+		@media (min-width: 768px) {
-		<div class="p-3 col">
+			.sidenav {
-			<ul class="nav nav-pills mb-auto-collapse" id="navbarSupportedContent">
+				width: 240px;
+			}
+		}
+	</style>
+<div class="row">
+	<nav class="navbar-expand-md bg-light sidenav border-end">
+		<div class="container">
+			<div class="collapse navbar-collapse" id="navbarSupportedContent">
+				<nav class="navbar navbar-expand-md bg-light sidenav col" style="margin-top: -20px;">
+					<ul class="navbar-nav me-auto mb-2 mb-lg-0 flex-column col mt-4">
 						{{ $currentPage := . }}
 						{{ range .Site.Menus.docs.ByWeight.Reverse }}
 							<li class="nav-item">
@@ -23,9 +32,12 @@
 							{{ end }}
 						{{ end }}
 					</ul>
+				</nav>
 			</div>
 		</div>
-	<div class="p-3 col">
+	</nav>
+
+	<container class="col mt-2" style="padding-left: 20px; padding-right: 20px;">
 		<div>
 			<h1>{{ .Title }}</h1>
 			<p><em>
@@ -47,7 +59,7 @@
 				Want to help improve this page? <a href="https://github.com/Rosettea/Hilbish/issues/new/choose">Create an issue.</a>
 			</p>
 		</div>
-	</div>
+	</container>
 </div>
 {{ end }}
 

website/themes/hsh/layouts/_default/list.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-<main>
+<main class="mt-4 mb-4">
   <div class="row row-cols-1 row-cols-md-1 g-4">
     {{ range where .Site.RegularPages "Section" "in" "blog" }}
       <div class="col d-flex justify-content-center">

website/themes/hsh/layouts/index.html

@@ -1,6 +1,8 @@
 {{ define "main" }}
-<main style="max-width: 80em; margin: auto;">
+<div>
+	<main style="padding-left: 20px; padding-right: 20px; padding-top: 15px; max-width: 84em; margin: auto;">
 		{{.Content}}
-</main>
+	</main>
+</div>
 {{ end }}
 

website/themes/hsh/layouts/partials/footer.html

@@ -1,24 +1,11 @@
-<footer class="footer mt-auto mt-auto py-3 bg-light row">
+<footer class="footer mt-auto mt-auto py-3 bg-light row border-top">
 	<div class="col mb-3">
 	</div>
 
 	<div class="col mb-3">
 		<a href="/Hilbish" class="d-flex align-items-center mb-3 link-dark text-decoration-none">
-		<img src="/Hilbish/hilbish-flower.png" alt="" height="48" class="d-inline-block align-text-top">
+			<img src="/Hilbish/hilbish-logo-and-text.png" alt="" height="48" class="d-inline-block align-text-top" style="margin-left: -20px">
 		</a>
-		<p class="text-muted">
-			Rosettea &copy; 2022
-			<br>
-			Made with <i class="fa-solid fa-heart" style="color: #f6345b;"></i>
-		</p>
-	</div>
-
-	<div class="col mb-3"></div>
-	<div class="col mb-3"></div>
-	<div class="col mb-3"></div>
-
-	<div class="col mb-3">
-		<h5>Hilbish</h5>
 		<ul class="nav flex-column">
 			<li class="nav-item mb-2"><a href="/Hilbish" class="nav-link p-0 text-muted">Home</a></li>
 			<li class="nav-item mb-2"><a href="/Hilbish/docs/faq" class="nav-link p-0 text-muted">FAQ</a></li>
@@ -29,4 +16,16 @@
 	</div>
 
 	<div class="col mb-3"></div>
+
+	<div class="col mb-3"></div>
+	<div class="col mb-3"></div>
+	<div class="col mb-3">
+		<p class="text-muted mt-4">
+			Rosettea &copy; 2022-2023
+			<br>
+			Made with <i class="fa-solid fa-heart" style="color: #f6345b;"></i>
+		</p>
+	</div>
+
+	<div class="col mb-3"></div>
 </footer>

website/themes/hsh/layouts/partials/header.html

@@ -1,9 +1,8 @@
 <header>
-	<nav class="navbar navbar-expand-md sticky-top bg-light">
+	<nav class="navbar navbar-expand-md sticky-top bg-light border-bottom">
 		<div class="container-fluid">
 			<a class="navbar-brand" href="/Hilbish">
-				<img src="/Hilbish/hilbish-flower.png" alt="" height="24" class="d-inline-block align-text-top">
+				<img src="/Hilbish/hilbish-logo-and-text.png" alt="" height="48">
-				Hilbish
 			</a>
 			<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 				<span class="navbar-toggler-icon"></span>