diff --git a/common/.config/Code/User/settings.json b/common/.config/Code/User/settings.json index 9101267..3d970d1 100644 --- a/common/.config/Code/User/settings.json +++ b/common/.config/Code/User/settings.json @@ -185,8 +185,6 @@ "markdownlint.config": { "default": true, "MD007": false, - "MD024": false, - "MD029": false, "MD030": false, "MD033": false, "MD046": false, diff --git a/common/.config/nvim/init.lua b/common/.config/nvim/init.lua index 91265df..061934d 100644 --- a/common/.config/nvim/init.lua +++ b/common/.config/nvim/init.lua @@ -14,6 +14,7 @@ -- g+: [G]it Operations -- l+: [L]ist Things -- n+: [N]eoVim Stuff +-- q+: DB [Q]ueries -- s+: Grep/[S]earch Things -- t+: [T]est runner stuff -- x+: close/dismiss something diff --git a/common/.config/nvim/lua/plugins/code-git.lua b/common/.config/nvim/lua/plugins/code-git.lua index 5260973..214f855 100644 --- a/common/.config/nvim/lua/plugins/code-git.lua +++ b/common/.config/nvim/lua/plugins/code-git.lua @@ -9,7 +9,7 @@ return { -- FIX: Open files do NOT get replaced with the changed branch require("telescope").load_extension("git_worktree") - vim.keymap.set("n", "glw", " lua require('telescope').extensions.git_worktree.git_worktrees()") + vim.keymap.set("n", "gw", " lua require('telescope').extensions.git_worktree.git_worktrees()") end, }, @@ -26,7 +26,7 @@ return { changedelete = { text = "~" }, untracked = { text = "┆" }, }, - attach_to_untracker = true, + attach_to_untracked = true, on_attach = function(bufnr) local gs = package.loaded.gitsigns @@ -63,6 +63,9 @@ return { map("n", "gsh", gs.stage_hunk, { desc = "Git: Stage Hunk" }) map("n", "gsu", gs.undo_stage_hunk, { desc = "Git: Undo Stage Hunk" }) map("n", "gsb", gs.stage_buffer, { desc = "Git: Stage Current File" }) + map("n", "gb", function() + gs.blame_line({ full = true }) + end, { desc = "Git: Hover blame-line" }) -- visual mode map("v", "gsH", function() diff --git a/common/.config/nvim/lua/plugins/code-lsp.lua b/common/.config/nvim/lua/plugins/code-lsp.lua index 58683da..b689417 100644 --- a/common/.config/nvim/lua/plugins/code-lsp.lua +++ b/common/.config/nvim/lua/plugins/code-lsp.lua @@ -58,9 +58,6 @@ return { -- Add any additional override configuration in the following tables. They will be passed to the `settings` field of the server config -- If you want to override the default filetypes that your language server will attach to you can define the property 'filetypes' to the map in question. local servers = { - -- clangd = {}, - -- gopls = {}, - lua_ls = { Lua = { workspace = { checkThirdParty = false }, @@ -70,50 +67,9 @@ return { -- diagnostics = { disable = { 'missing-fields' } }, }, }, - - -- Markdown - marksman = {}, - - awk_ls = {}, - bashls = { - filetypes = { "sh", "bash", "zsh" }, - }, - cssls = {}, - dockerls = {}, - docker_compose_language_service = {}, + bashls = { filetypes = { "sh", "bash", "zsh" } }, html = { filetypes = { "html", "twig", "hbs" } }, - jsonls = {}, - pyright = {}, - rust_analyzer = {}, tsserver = { - -- keys = { - -- { - -- "co", - -- function() - -- vim.lsp.buf.code_action({ - -- apply = true, - -- context = { - -- only = { "source.organizeImports.ts" }, - -- diagnostics = {}, - -- }, - -- }) - -- end, - -- desc = "Typescript: Organize Imports", - -- }, - -- { - -- "cO", - -- function() - -- vim.lsp.buf.code_action({ - -- apply = true, - -- context = { - -- only = { "source.removeUnused.ts" }, - -- diagnostics = {}, - -- }, - -- }) - -- end, - -- desc = "Typescript: Remove Unused Imports", - -- }, - -- }, settings = { completions = { completeFunctionCalls = true, @@ -144,6 +100,17 @@ return { }, }, }, + + -- https://github.com/joe-re/sql-language-server?tab=readme-ov-file#configuration + sqlls = {}, + marksman = {}, + awk_ls = {}, + cssls = {}, + dockerls = {}, + docker_compose_language_service = {}, + jsonls = {}, + pyright = {}, + rust_analyzer = {}, } -- nvim-cmp supports additional completion capabilities, so broadcast that to servers @@ -184,6 +151,34 @@ return { end, }) end, + keys = { + { + "co", + function() + vim.lsp.buf.code_action({ + apply = true, + context = { + only = { "source.organizeImports.ts" }, + diagnostics = {}, + }, + }) + end, + desc = "Typescript: Organize Imports", + }, + { + "cO", + function() + vim.lsp.buf.code_action({ + apply = true, + context = { + only = { "source.removeUnused.ts" }, + diagnostics = {}, + }, + }) + end, + desc = "Typescript: Remove Unused Imports", + }, + }, }, { diff --git a/common/.config/nvim/lua/plugins/navigate-files.lua b/common/.config/nvim/lua/plugins/navigate-files.lua index 31c2438..7b8f5dd 100644 --- a/common/.config/nvim/lua/plugins/navigate-files.lua +++ b/common/.config/nvim/lua/plugins/navigate-files.lua @@ -206,7 +206,6 @@ return { { "nvim-telescope/telescope.nvim", branch = "0.1.x", - lazy = false, dependencies = { "nvim-lua/plenary.nvim", { diff --git a/common/.config/nvim/lua/plugins/ui.lua b/common/.config/nvim/lua/plugins/ui.lua index a053056..7042ef8 100644 --- a/common/.config/nvim/lua/plugins/ui.lua +++ b/common/.config/nvim/lua/plugins/ui.lua @@ -155,6 +155,7 @@ return { { find = ">ed" }, { find = "b"] = { name = "Buffer Operations", _ = "which_key_ignore" }, ["d"] = { name = "Diagnostics", _ = "which_key_ignore" }, ["f"] = { name = "File Operations", _ = "which_key_ignore" }, - ["g"] = { name = "Git Operations", _ = "which_key_ignore" }, + ["g"] = { name = "Git", _ = "which_key_ignore" }, + ["h"] = { name = "Harpoon", _ = "which_key_ignore" }, ["l"] = { name = "List Things", _ = "which_key_ignore" }, ["n"] = { name = "NVIM Operations", _ = "which_key_ignore" }, + ["q"] = { name = "Database Query", _ = "which_key_ignore" }, ["s"] = { name = "Search/Grep Things", _ = "which_key_ignore" }, ["t"] = { name = "Unit Test Operations", _ = "which_key_ignore" }, ["x"] = { name = "Delete/Remove Something", _ = "which_key_ignore" }, diff --git a/common/.vim/configs.vim b/common/.vim/configs.vim index b6393dd..2e8550e 100644 --- a/common/.vim/configs.vim +++ b/common/.vim/configs.vim @@ -18,7 +18,6 @@ set autoread " Auto reload file if externally changed set nrformats-=octal " Do not let Ctrl-a + Ctrl-x work on octal format numbers set formatoptions=jcroqlnt " When joining lines with J, delete comment characters set display+=truncate " @@@ is displayed in the 1st column of the last screen line -set conceallevel=2 " Hide * markup for bold and italic, but not markers with substitutions set tabpagemax=50 " Max number of tabs set viminfo^=! set viewoptions-=options diff --git a/common/.zshrc b/common/.zshrc index fca12ef..eb6df59 100644 --- a/common/.zshrc +++ b/common/.zshrc @@ -1,3 +1,4 @@ +#!/bin/zsh # I'm not using a separate .zprofile; reuse the .profile instead [[ ! -f "$HOME/.profile" ]] || source "$HOME/.profile"