Improved prompt theme and fixed lua_ls config

6 files changed, 71 insertions, 14 deletions

diff --git a/.config/nvim/lsp/lua_ls.lua b/.config/nvim/lsp/lua_ls.lua
index b4fd5c8..89bb889 100644
--- a/.config/nvim/lsp/lua_ls.lua
+++ b/.config/nvim/lsp/lua_ls.lua
@@ -1,18 +1,51 @@
 return {
-	settings = {
-		Lua = {
+	on_init = function(client)
+		if client.workspace_folders then
+			local path = client.workspace_folders[1].name
+			if
+			    path ~= vim.fn.stdpath('config')
+			then
+				return
+			end
+		end
+
+		client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
 			runtime = {
-				version = 'LuaJIT'
+				-- Tell the language server which version of Lua you're using (most
+				-- likely LuaJIT in the case of Neovim)
+				version = 'LuaJIT',
+				-- Tell the language server how to find Lua modules same way as Neovim
+				-- (see `:h lua-module-load`)
+				path = {
+					'lua/?.lua',
+					'lua/?/init.lua',
+				},
 			},
+			-- Make the server aware of Neovim runtime files
 			workspace = {
-				library = vim.api.nvim_get_runtime_file("", true)
-			},
+				checkThirdParty = false,
+				library = {
+					vim.env.VIMRUNTIME
+					-- Depending on the usage, you might want to add additional paths
+					-- here.
+					-- '${3rd}/luv/library'
+					-- '${3rd}/busted/library'
+				}
+				-- Or pull in all of 'runtimepath'.
+				-- NOTE: this is a lot slower and will cause issues when working on
+				-- your own configuration.
+				-- See https://github.com/neovim/nvim-lspconfig/issues/3189
+				-- library = {
+				--   vim.api.nvim_get_runtime_file('', true),
+				-- }
+			}
+		})
+	end,
+	settings = {
+		Lua = {
 			completion = {
 				callSnippet = 'Replace',
 			},
-			diagnostics = {
-				disable = { 'missing-fields' }
-			},
 			hint = {
 				enable = true
 			}
diff --git a/.local/share/nvim/site/pack/plugins/start/nvim-lspconfig b/.local/share/nvim/site/pack/plugins/start/nvim-lspconfig
-Subproject 7fac9025a967a4d0846660f751cd392fac6bb78
+Subproject dbfd8da6206b4ab0e2fe9b72a538f82e2b41010
diff --git a/.local/share/nvim/site/pack/plugins/start/nvim-treesitter b/.local/share/nvim/site/pack/plugins/start/nvim-treesitter
-Subproject 4400990e7362e2769bb1ff96895f623deb0380f
+Subproject a5edb0a274d0881dcb4670e2f9e06d2a146f74d
diff --git a/.zfunc/prompt_marc_setup b/.zfunc/prompt_marc_setup
index 80e7931..be3b8e6 100644
--- a/.zfunc/prompt_marc_setup
+++ b/.zfunc/prompt_marc_setup
@@ -17,13 +17,8 @@ prompt_marc_setup () {
 
     VIRTUAL_ENV_DISABLE_PROMPT=1
 
-    zstyle ':vcs_info:*' check-for-changes true
-    zstyle ':vcs_info:*' get-revision true
-    zstyle ':vcs_info:*' formats "%s:%R|%S@%b %m%u%c"
-    zstyle ':vcs_info:*' actionformats "%s:%r|%S@%b (%a) %m%u%c"
-
     prompt_opts=( "subst" "percent" )
-    PS1='%B%? %n@%M:%~ (j: %j v: ${VIRUAL_ENV:-none}) %# %b'
+    PS1='%B%? %n@%M:%~ (j: %j h: %! t: %y) %# %b'
     RPS1='%B$vcs_info_msg_0_%b'
 }
 
diff --git a/.zfunc/zsh-completions b/.zfunc/zsh-completions
-Subproject e07f6fb780725e9c0f50a7666700cf91ded3022
+Subproject 922abfe7073bc7af2d6950712670ceb5de73d4a
diff --git a/.zshrc b/.zshrc
index c618c09..a91e19e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -56,4 +56,33 @@ alias help=run-help
 
 autoload -Uz e v p bell
 
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:*' get-revision true
+zstyle ':vcs_info:*' formats "(%s)-[%b]%m%u%c"
+zstyle ':vcs_info:*' actionformats "(%s)-[%b]%m%u%c"
+
+zstyle ':vcs_info:git*+set-message:*' hooks git-untracked
+
++vi-git-untracked() {
+	if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' ]] && \
+		git status --porcelain | grep -m 1 '^??' &>/dev/null
+	then
+		hook_com[misc]='T'
+	fi
+}
+
+zstyle ':vcs_info:git*+set-message:*' hooks git-st
+
+function +vi-git-st() {
+    local ahead behind
+    local -a gitstatus
+
+    ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
+    (( $ahead )) && gitstatus+=( "+${ahead}" )
+
+    behind=$(git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
+    (( $behind )) && gitstatus+=( "-${behind}" )
+
+    hook_com[misc]+=${(j:/:)gitstatus}
+}