general updates

Signed-off-by: Daryl Ronningen <relms@relms.dev>

.config/lazygit/config.yml

@@ -0,0 +1,9 @@
+gui:
+  showIcons: true
+git:
+  paging:
+    colorArg: always
+    pager: delta --dark --paging=never
+  commit:
+    signOff: true
+  parseEmoji: true

.config/nvim/init.lua

@@ -21,3 +21,4 @@ require("user.whichkey")
 require("user.trouble")
 require("user.colorizer")
 require("user.gps")
+require("user.discord")

.config/nvim/lua/user/cmp.lua

@@ -3,6 +3,11 @@ if not cmp_status_ok then
 	return
 end
 
+local npm_status_ok, npm = pcall(require, "cmp-npm")
+if not npm_status_ok then
+	return
+end
+
 local snip_status_ok, luasnip = pcall(require, "luasnip")
 if not snip_status_ok then
 	return
@@ -15,6 +20,8 @@ local check_backspace = function()
 	return col == 0 or vim.fn.getline("."):sub(col, col):match("%s")
 end
 
+npm.setup({})
+
 local kind_icons = {
 	Text = "",
 	Method = "m",
@@ -96,6 +103,8 @@ cmp.setup({
 			vim_item.kind = string.format("%s", kind_icons[vim_item.kind])
 			vim_item.menu = ({
 				nvim_lsp = "[LSP]",
+				cmp_tabnine = "[TABNINE]",
+				npm = "[NPM]",
 				nvim_lua = "[NVIM_LUA]",
 				luasnip = "[Snippet]",
 				buffer = "[Buffer]",
@@ -106,6 +115,8 @@ cmp.setup({
 	},
 	sources = {
 		{ name = "nvim_lsp" },
+		{ name = "cmp_tabnine" },
+		{ name = "npm" },
 		{ name = "nvim_lua" },
 		{ name = "luasnip" },
 		{ name = "buffer" },

.config/nvim/lua/user/discord.lua

@@ -0,0 +1,6 @@
+local status_ok, discord = pcall(require, "presence")
+if not status_ok then
+	return
+end
+
+discord:setup({})

.config/nvim/lua/user/lsp/settings/volar.json

@@ -1,3 +1,5 @@
 {
-	"volar.takeOverMode.enabled": true
+	"volar.preview.script.nuxi": "node {NUXI_BIN} dev --port {PORT}",
+	"volar.takeOverMode.enabled": true,
+	"volar.codeLens.pugTools": true
 }

.config/nvim/lua/user/nvimtree.lua

@@ -52,7 +52,6 @@ nvim_tree.setup({
 		height = 30,
 		hide_root_folder = false,
 		side = "left",
-		auto_resize = true,
 		mappings = {
 			custom_only = false,
 			list = {

.config/nvim/lua/user/plugins.lua

@@ -54,6 +54,8 @@ return packer.startup(function(use)
 	use("saadparwaiz1/cmp_luasnip")
 	use("hrsh7th/cmp-nvim-lsp")
 	use("hrsh7th/cmp-nvim-lua")
+	use({ "tzachar/cmp-tabnine", run = "./install.sh" })
+	use("David-Kunz/cmp-npm")
 
 	-- Snippets
 	use("L3MON4D3/LuaSnip")
@@ -128,6 +130,12 @@ return packer.startup(function(use)
 	-- GPS
 	use("SmiteshP/nvim-gps")
 
+	-- Wakatime
+	use("wakatime/vim-wakatime")
+
+	-- Discord
+	use("andweeb/presence.nvim")
+
 	if PACKER_BOOTSTRAP then
 		require("packer").sync()
 	end

.config/nvim/plugin/packer_compiled.lua

@@ -99,6 +99,11 @@ _G.packer_plugins = {
     path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-cmdline",
     url = "https://github.com/hrsh7th/cmp-cmdline"
   },
+  ["cmp-npm"] = {
+    loaded = true,
+    path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-npm",
+    url = "https://github.com/David-Kunz/cmp-npm"
+  },
   ["cmp-nvim-lsp"] = {
     loaded = true,
     path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
@@ -114,6 +119,11 @@ _G.packer_plugins = {
     path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-path",
     url = "https://github.com/hrsh7th/cmp-path"
   },
+  ["cmp-tabnine"] = {
+    loaded = true,
+    path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-tabnine",
+    url = "https://github.com/tzachar/cmp-tabnine"
+  },
   cmp_luasnip = {
     loaded = true,
     path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
@@ -234,6 +244,11 @@ _G.packer_plugins = {
     path = "/home/relms/.local/share/nvim/site/pack/packer/start/popup.nvim",
     url = "https://github.com/nvim-lua/popup.nvim"
   },
+  ["presence.nvim"] = {
+    loaded = true,
+    path = "/home/relms/.local/share/nvim/site/pack/packer/start/presence.nvim",
+    url = "https://github.com/andweeb/presence.nvim"
+  },
   ["sqlite.lua"] = {
     loaded = true,
     path = "/home/relms/.local/share/nvim/site/pack/packer/start/sqlite.lua",
@@ -304,6 +319,11 @@ _G.packer_plugins = {
     path = "/home/relms/.local/share/nvim/site/pack/packer/start/vim-illuminate",
     url = "https://github.com/RRethy/vim-illuminate"
   },
+  ["vim-wakatime"] = {
+    loaded = true,
+    path = "/home/relms/.local/share/nvim/site/pack/packer/start/vim-wakatime",
+    url = "https://github.com/wakatime/vim-wakatime"
+  },
   ["which-key.nvim"] = {
     loaded = true,
     path = "/home/relms/.local/share/nvim/site/pack/packer/start/which-key.nvim",

.gitconfig

@@ -14,3 +14,17 @@
 	program = gpg
 [color]
 	ui = auto
+[core]
+	editor = nvim
+	pager = delta
+[interactive]
+	diffFilter = delta --color-only
+[delta]
+	navigate = true
+	light = false
+	line-numbers = true
+	side-by-side = true
+[merge]
+	conflictstyle = diff3
+[diff]
+	colorMoved = default

.zshrc

@@ -106,15 +106,35 @@ gitlog() {
 	setterm -linewrap on
 }
 
+# Enable Discord RPC in WSL
+if uname -r | grep 'Microsoft' ; then
+	nvim() {
+		pidof sudo > /dev/null
+		if [ $? -ne 0 ]; then
+			sudo socat UNIX-LISTEN:/var/run/discord-ipc-0,fork,group=discord,umask=007 EXEC:"npiperelay.exe -ep -s //./pipe/discord-ipc-0",nofork &
+		fi
+		command nvim "$@"
+
+		while true; do
+			pidof nvim >/dev/null
+			if [ $? -ne 0 ]; then
+				sudo killall -9 socat
+				sudo killall -9 npiperelay.exe
+				sudo rm -rfv /var/run/discord-ipc-0
+				break
+			fi
+		done
+	}
+fi
+
 # Load nvm
 source /usr/share/nvm/init-nvm.sh
 
 # Make GPG work in WSL
 export GPG_TTY=$(tty)
 
-# Set FUCK
+# Enable fuck
-eval $(thefuck --alias fuck)
+eval $(thefuck --alias)
-eval $(thefuck --alias FUCK)
 
 # Set starship Prompt
 eval "$(starship init zsh)"