Use prettier instead of prettierd

I keep having issues with prettierd not working and prettier works just
fine.

git/configs/common.gitconfig

@@ -24,7 +24,7 @@
 	tool = nvimdiff
 
 [init]
-	defaultBranch = master
+	defaultBranch = main
 
 [rebase]
   autosquash = true

nvim/dot-config/nvim/lazy-lock.json

@@ -25,7 +25,7 @@
   "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
   "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d89f4891f0720cd2598e4bdd60010d8784b2ac8a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
   "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
@@ -47,5 +47,5 @@
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "74163ac321c7d208a5bb9cdf8964114c7064d6c7" },
   "undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "which-key.nvim": { "branch": "winborder-support", "commit": "ab1a3b0d3005a95507ba6c18b96531d430370885" }
 }

nvim/dot-config/nvim/lsp/lua_ls.lua

@@ -1,8 +1,23 @@
 return {
 	settings = {
 		Lua = {
-			workspace = { checkThirdParty = false },
+			workspace = {
+				checkThirdParty = false,
+				library = {
+					"./definitions",
+				},
+			},
 			telemetry = { enable = false },
+			type = {
+				checkTableShape = true,
+			},
+			diagnostics = {
+				neededFileStatus = {
+					-- ["no-unknown"] = "Opened",
+					-- ["incomplete-signature-doc"] = "Opened",
+					-- ["await-in-sync"] = "Opened",
+				},
+			},
 		},
 	},
 }

nvim/dot-config/nvim/lua/lsp.lua

@@ -148,7 +148,10 @@ vim.api.nvim_create_autocmd("LspAttach", {
 	end,
 })
 
--- Manually enable rust analyzer, if installed
+-- Manually enable lsps, if installed
 if vim.fn.executable("rust_analyzer") then
 	vim.lsp.enable("rust_analyzer")
 end
+if vim.fn.executable("vtsls") then
+	vim.lsp.enable("vtsls")
+end

nvim/dot-config/nvim/lua/plugins/conform.lua

@@ -5,15 +5,15 @@ local formatters_by_ft = {
 	go = { "goimports" },
 	python = { "ruff_organize_imports", "ruff_format" },
 	rust = { "rustfmt" },
-	javascript = { "prettierd" },
+	javascript = { "prettier" },
-	javascriptreact = { "prettierd" },
+	javascriptreact = { "prettier" },
-	typescript = { "prettierd" },
+	typescript = { "prettier" },
-	typescriptreact = { "prettierd" },
+	typescriptreact = { "prettier" },
-	css = { "prettierd" },
+	css = { "prettier" },
-	markdown = { "prettierd" },
+	markdown = { "prettier" },
-	yaml = { "prettierd" },
+	yaml = { "prettier" },
 	lua = { "stylua" },
-	json = { "prettierd" },
+	json = { "prettier" },
 	toml = { "taplo" },
 	-- ["*"] = { "injected" },
 	["_"] = { "trim_whitespace", "trim_newlines" },

nvim/dot-config/nvim/lua/plugins/mason-tool-installer.lua

@@ -24,8 +24,9 @@ local ensure_installed = {
 		end,
 	},
 	"ruff",
-	"prettierd",
+	"prettier",
 	"stylua",
+	"eslint",
 }
 
 --- @module "lazy"

nvim/dot-config/nvim/lua/plugins/which-key.lua

@@ -3,7 +3,9 @@ local window = require("symbols.window")
 --- @module "lazy"
 --- @type LazySpec
 return {
-	"folke/which-key.nvim",
+	-- "folke/which-key.nvim",
+	"cameronr/which-key.nvim",
+	branch = "winborder-support",
 	event = "VeryLazy",
 	--- @module "which-key"
 	--- @type wk.Opts

zsh/dot-zshrc

@@ -55,7 +55,7 @@ export EDITOR=nvim
 
 alias cl="clear"
 
-if (( $+commands[hash] )); then
+if (( $+commands[bat] )); then
 	export BAT_THEME="gruvbox-dark"
 	alias cat=bat
 fi
@@ -87,12 +87,14 @@ if (( $+commands[devcontainer] )); then
 	}
 fi
 
-if (( $+commands[pnpm] )); then
+export PNPM_HOME="/home/tim/.local/share/pnpm"
-	export PNPM_HOME="/home/tim/.local/share/pnpm"
+if [ -d "$PNPM_HOME" ]; then
 	case ":$PATH:" in
 	  *":$PNPM_HOME:"*) ;;
 	  *) export PATH="$PNPM_HOME:$PATH" ;;
 	esac
+else
+	unset PNPM_HOME
 fi
 
 export FZF_DEFAULT_OPTS='--tmux'