From a27480b02bf51c9eea7bc263395f9769b4ddf5fa Mon Sep 17 00:00:00 2001
From: Wynd <wyndmaster@gmail.com>
Date: Wed, 5 Jun 2024 15:49:29 +0300
Subject: [PATCH] Replaced neodev with lazydev and a new script to fix opening
 nvim via a file manager

---
 .config/nvim/lazy-lock.json                   |   3 +-
 .../nvim/lua/nvwynd/plugins/completion.lua    |   7 +++++
 .config/nvim/lua/nvwynd/plugins/lsp.lua       |  27 ++++++++++++++++--
 .config/nvim/spell/en.utf-8.add               |  11 +++++++
 .config/nvim/spell/en.utf-8.add.spl           | Bin 193 -> 320 bytes
 .local/bin/nvimstart.sh                       |   8 ++++++
 .zshrc                                        |   7 ++++-
 dot.toml                                      |   3 ++
 8 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 .local/bin/nvimstart.sh

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 0f48380..9448cc3 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -11,10 +11,11 @@
   "fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
   "image.nvim": { "branch": "master", "commit": "cdf1be9c708e75be936cc42d8122b748a51482e4" },
   "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" },
+  "lazydev.nvim": { "branch": "main", "commit": "107231114623e2c4f90c626ec83b3120816b554e" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "b93f040edd57888cd6a1e7d9dee47dddc4463f8f" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
-  "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
   "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
   "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
   "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
diff --git a/.config/nvim/lua/nvwynd/plugins/completion.lua b/.config/nvim/lua/nvwynd/plugins/completion.lua
index b3ff6f6..25d1a77 100644
--- a/.config/nvim/lua/nvwynd/plugins/completion.lua
+++ b/.config/nvim/lua/nvwynd/plugins/completion.lua
@@ -11,6 +11,13 @@ return {
 			"L3MON4D3/LuaSnip",
 			"saadparwaiz1/cmp_luasnip",
 		},
+		opts = function(_, opts)
+			opts.sources = opts.sources or {}
+			table.insert(opts.sources, {
+				name = "lazydev",
+				group_index = 0,
+			})
+		end,
 		config = function()
 			vim.opt.completeopt = { "menu", "menuone", "noselect" }
 
diff --git a/.config/nvim/lua/nvwynd/plugins/lsp.lua b/.config/nvim/lua/nvwynd/plugins/lsp.lua
index 83f3086..45c7b83 100644
--- a/.config/nvim/lua/nvwynd/plugins/lsp.lua
+++ b/.config/nvim/lua/nvwynd/plugins/lsp.lua
@@ -91,6 +91,11 @@ return {
 				capabilities = capabilities,
 			})
 
+			-- JSON
+			lspconfig.jsonls.setup({
+				capabilities = capabilities,
+			})
+
 			vim.api.nvim_create_autocmd("LspAttach", {
 				group = vim.api.nvim_create_augroup("nvwynd-lsp-attach", { clear = true }),
 				callback = function(event)
@@ -130,7 +135,25 @@ return {
 	},
 
 	{
-		"folke/neodev.nvim",
-		opts = {},
+		"folke/lazydev.nvim",
+		ft = "lua",
+		opts = {
+			library = {
+				{
+					path = "luvit-meta/library",
+					words = { "vim%.uv" },
+				},
+			},
+		},
 	},
+
+	{
+		"Bilal2453/luvit-meta",
+		lazy = true,
+	},
+
+	-- {
+	-- 	"folke/neodev.nvim",
+	-- 	opts = {},
+	-- },
 }
diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
index 5818f5f..b4a8b47 100644
--- a/.config/nvim/spell/en.utf-8.add
+++ b/.config/nvim/spell/en.utf-8.add
@@ -13,3 +13,14 @@ NPCs
 NPC
 Glowstone
 Eisen
+flatpak
+github
+oauth
+debian
+LTS
+flarum
+piw
+Gitea
+Hetzner
+overworld
+WIP
diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl
index ba2b5d68d4b3417dee7be3d84d510fc338b6de71..c35a94deadadcf8f96474da5e2366e0797f6affb 100644
GIT binary patch
literal 320
zcmXX?F>(Si5VIDl6nOzXJv|joD3VD<Z#cu<U~JFX+yNDT$%FDFkQZF+Sdv$}@@D;=
zlk<M@Fvk3U?i#m0v_8a?%XmRVz#bhAVls@lh%J!?jF|-#)jXWyOeOOkAOa67eZg6k
z6VkiqIO%*r5!Y5>Y2OdF95k}I=)kHt93fM>72N2k6P7&@#h4`x*ojQD7`a#Ks}noW
zO!ZmI_dN|GtJe*hiR}ie{mW?{l^wM@rl_tpZKF(NlFB4{SX^tEivI$?=mS6a#fr-k
G@H_z(a5@A4

literal 193
zcmX9&F%H5o4D?xD-~)XI5?_FY0mQ^!HK9U;G{R8<iJ?C)m*Bzn`R;6A4o6EqgzX|C
z-&ODY5R>IMMnqh3!=Pdi!dzj12Si#UW$YtVHDvNH;!<PbHy(FrqiI5~+L(&YbQI@9
oyNSXl&0`%@L+iPo^uAnnbzW9>_#iO<HI6^7al#op9wT7<0ANWXQ~&?~

diff --git a/.local/bin/nvimstart.sh b/.local/bin/nvimstart.sh
new file mode 100644
index 0000000..4193a38
--- /dev/null
+++ b/.local/bin/nvimstart.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# For some unexplainable reason (probably some GNOME "feature") opening nvim from a file manager (any)
+# via its .desktop file doesn't fully load the user's PATH so we forcing it
+# This doesn't happen when opening from a terminal however.
+
+export PATH=$PATH:/home/wynd/.asdf/shims/ \
+	&& env -u WAYLAND_DISPLAY alacritty -e nvim "$1"
diff --git a/.zshrc b/.zshrc
index 8a28c1e..71387b5 100644
--- a/.zshrc
+++ b/.zshrc
@@ -79,8 +79,13 @@ alias myip="curl http://ipecho.net/plain; echo"
 alias diskspace="df -ht ext4"
 
 # git shortcuts
-alias git-line-stats="git ls-files | xargs -n1 git blame --line-porcelain | sed -n 's/^author //p' | sort -f | uniq -ic | sort -nr"
 alias glo="git log --pretty='format:%C(yellow)%as %C(blue)%cn %C(green)%h %C(reset)%s' --no-merges"
+alias glm="git_last_modified"
+
+function git_last_modified() {(
+	days=${1:-5}
+	git diff $(git log -1 --before=@{$days.days.ago} --format=%H) --stat
+)}
 
 # private SSH stuff
 source ~/.piwrc
diff --git a/dot.toml b/dot.toml
index 1b7794f..5b33fd3 100644
--- a/dot.toml
+++ b/dot.toml
@@ -24,3 +24,6 @@ path = "~/.config/btop/btop.conf"
 
 [[dots]]
 path = "~/.config/alacritty/*"
+
+[[dots]]
+path = "~/.local/bin/nvimstart.sh"