Skip to content

Commit

Permalink
eliminating the various annoyances and error messages that arose
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomashighbaugh committed Mar 15, 2024
1 parent 0115b60 commit bbcce37
Show file tree
Hide file tree
Showing 9 changed files with 113 additions and 143 deletions.
Empty file.
52 changes: 27 additions & 25 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
"LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
"SchemaStore.nvim": { "branch": "main", "commit": "5d7f8c3e7ae4e3fa5daedb83306406f95257201c" },
"SchemaStore.nvim": { "branch": "main", "commit": "9f74c6a52f4f6adaf3b3d64b15d2363219afefae" },
"animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
"barbecue.nvim": { "branch": "main", "commit": "d38a2a023dfb1073dd0e8fee0c9be08855d3688f" },
"bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
Expand All @@ -23,61 +23,63 @@
"cmp-zsh": { "branch": "main", "commit": "c24db8e58fac9006ec23d93f236749288d00dec9" },
"cmp_kitty": { "branch": "main", "commit": "a0716db2efb4c452600ef1e4a3ca610889279118" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"codeium.nvim": { "branch": "main", "commit": "cd5913ff5481229b15186293d1d46dd9500789f9" },
"codeium.nvim": { "branch": "main", "commit": "73ba2a3a41484437ff8a45ca1e796fa9d6fa1153" },
"comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
"compile-nvim": { "branch": "main", "commit": "f7ad312ec5d0ae4a0554a7e52349ee371b868a5d" },
"conform.nvim": { "branch": "master", "commit": "34b81e70da83e26c048290204de44268eb59814e" },
"conform.nvim": { "branch": "master", "commit": "67ee2258e08ccb91345d52f62484b657feccef25" },
"copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
"copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
"crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" },
"crates.nvim": { "branch": "main", "commit": "b4f4987ccdb1cc3899ee541ef4375c73c48c4570" },
"dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" },
"dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
"dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
"emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
"friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
"gitsigns.nvim": { "branch": "main", "commit": "4e348641b8206c3b8d23080999e3ddbe4ca90efc" },
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
"hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
"indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
"keymap-layer.nvim": { "branch": "master", "commit": "e46840f9f377766e856964a49d7f351de3188a38" },
"kiwi.nvim": { "branch": "master", "commit": "47894404ca554d48f4e3f1e0bd59642464ca539f" },
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
"kiwi.nvim": { "branch": "master", "commit": "1a625771e3d3d9f50ca28a4501c11842f6c1ec1e" },
"lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
"lazygit.nvim": { "branch": "main", "commit": "774dcecbd0b9b57be6c150adacb60ced79b11b23" },
"llm.nvim": { "branch": "main", "commit": "51b76dac9c33c0122adfe28daf52ceaa31c4aa02" },
"lsp_signature.nvim": { "branch": "master", "commit": "e92b4e7073345b2a30a56b20db3d541a9aa2771e" },
"lsp_signature.nvim": { "branch": "master", "commit": "1b32f64549478efd8f9e0d00517db84cf41aa0ea" },
"lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lspsaga.nvim": { "branch": "main", "commit": "7cabe9468b48c8dbd4ba84536610c6ddf9b38dae" },
"lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
"lspsaga.nvim": { "branch": "main", "commit": "74b13f63417014739ac09576f7196bec301fa2ac" },
"lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "55716a879568a498fa236593c8119789054a3b8e" },
"mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" },
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
"middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
"mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" },
"mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" },
"mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" },
"mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
"mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" },
"monokai-pro.nvim": { "branch": "master", "commit": "1b9b086df95ad9a6b946c56f65fa2d048297c00b" },
"neo-tree-diagnostics.nvim": { "branch": "main", "commit": "e00434c3cf8637bcaf70f65c2b9d82b0cc9bd7dc" },
"neo-tree.nvim": { "branch": "main", "commit": "bce454018b1570153262eecab8a7546becce2274" },
"neo-tree.nvim": { "branch": "main", "commit": "120a83eb7c3c240d5298122111e9f65f0ee5bc8f" },
"neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
"nix-develop.nvim": { "branch": "main", "commit": "afea026f5c478c000a8af8de87f7b711676387ab" },
"noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
"none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" },
"nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" },
"none-ls.nvim": { "branch": "main", "commit": "72e25ed4162474ef5d666525853f8a42bffd97c5" },
"nui.nvim": { "branch": "main", "commit": "3dc46d725f7b94bee5117c0a699b57b1902b5d65" },
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
"nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
"nvim-dap": { "branch": "master", "commit": "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d" },
"nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" },
"nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" },
"nvim-lspconfig": { "branch": "master", "commit": "e5e600232188ed9fb960f5df6bb06084ae8bf3ec" },
"nvim-lspconfig": { "branch": "master", "commit": "4bdd3800b4148f670c6cf55ef65f490148eeb550" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
"nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" },
"nvim-treesitter": { "branch": "master", "commit": "a0f18ee98c53b9b20a7bda1696f1382cd79216e6" },
"nvim-spectre": { "branch": "master", "commit": "d1db6c1d37252b5a38f199e2f590c5a1617d9254" },
"nvim-treesitter": { "branch": "master", "commit": "f87882858438834d2fbb6379aa2be37de901751b" },
"nvim-treesitter-context": { "branch": "master", "commit": "b8b7e52c1517d401d7c519787d5dc4528c41291a" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" },
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
"nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" },
"nvim-web-devicons": { "branch": "master", "commit": "a851380fbea4c1312d11f13d5cdc86a7a19808dd" },
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
"plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
Expand All @@ -87,11 +89,11 @@
"sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
"statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" },
"swenv.nvim": { "branch": "main", "commit": "c11eeaa6f8f05abdcbb0a53d0ac290e3f9fabd2c" },
"telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
"telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" },
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
"toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
"venv-selector.nvim": { "branch": "main", "commit": "93ee4ac249277571a90db5b50aae83d6f9d036f5" },
"venv-selector.nvim": { "branch": "main", "commit": "2ad34f36d498ff5193ea10f79c87688bd5284172" },
"vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
"vim-eunuch": { "branch": "master", "commit": "8fb3904be27b6b60d086f87c2570085902414069" },
"vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" },
Expand Down
7 changes: 7 additions & 0 deletions lua/core/autocmds.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
local Util = require("util")
-- ─────────────────────────────────────────────────────────────────
-- Turn off paste mode when leaving insert
vim.api.nvim_create_autocmd("InsertLeave", {
command = "set nopaste",
pattern = "*",
})

-- +---------------------------------------------------------------+
-- Highlight on yank
vim.api.nvim_create_autocmd({ "TextYankPost" }, {
Expand Down
4 changes: 2 additions & 2 deletions lua/core/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ require("lazy").setup({
{ import = "resources.lang.php", enabled = true },
{ import = "resources.lang.typescript", enabled = true },
{ import = "resources.lang.json", enabled = true },
{ import = "resources.lang.java", enabled = true },
{ import = "resources.lang.java", enabled = false },
{ import = "resources.lang.docker", enabled = true },
{ import = "resources.lang.clangd", enabled = true },
{ import = "resources.lang.clangd", enabled = false },
},
defaults = {
lazy = false,
Expand Down
83 changes: 14 additions & 69 deletions lua/resources/coding.lua
Original file line number Diff line number Diff line change
Expand Up @@ -396,78 +396,23 @@ return {
end,
},
--╞═══════════════════════════════════════════════════════════════╡
-- Highlight, list and search todo comments in your projects
{
"folke/todo-comments.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
},
opts = {
signs = true, -- show icons in the signs column
sign_priority = 8, -- sign priority
-- keywords recognized as todo comments
keywords = {
FIX = {
icon = "", -- icon used for the sign, and in search results
color = "error", -- can be a hex color, or a named color (see below)
alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords
-- signs = false, -- configure signs for some keywords individually
},
TODO = { icon = "", color = "info" },
HACK = { icon = "", color = "warning" },
WARN = {
icon = "",
color = "warning",
alt = { "WARNING", "XXX" },
},
PERF = {
icon = "",
alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" },
},
NOTE = { icon = "", color = "hint", alt = { "INFO" } },
},
merge_keywords = true, -- when true, custom keywords will be merged with the defaults
-- highlighting of the line containing the todo comment
-- * before: highlights before the keyword (typically comment characters)
-- * keyword: highlights of the keyword
-- * after: highlights after the keyword (todo text)
highlight = {
before = "", -- "fg" or "bg" or empty
keyword = "wide", -- "fg", "bg", "wide" or empty. (wide is the same as bg, but will also highlight surrounding characters)
after = "fg", -- "fg" or "bg" or empty
pattern = [[.*<(KEYWORDS)\s*:]], -- pattern or table of patterns, used for highlightng (vim regex)
comments_only = true, -- uses treesitter to match keywords in comments only
max_line_len = 1000, -- ignore lines longer than this
exclude = {}, -- list of file types to exclude highlighting
},
-- list of named colors where we try to extract the guifg from the
-- list of highlight groups or use the hex color if hl not found as a fallback
colors = {
error = { "LspDiagnosticsDefaultError", "ErrorMsg", "#DC2626" },
warning = {
"LspDiagnosticsDefaultWarning",
"WarningMsg",
"#FBBF24",
},
info = { "LspDiagnosticsDefaultInformation", "#2563EB" },
hint = { "LspDiagnosticsDefaultHint", "#10B981" },
default = { "Identifier", "#7C3AED" },
},
search = {
command = "rg",
args = {
"--color=never",
"--no-heading",
"--with-filename",
"--line-number",
"--column",
},
-- regex that will be used to match keywords.
-- don't replace the (KEYWORDS) placeholder
pattern = [[\b(KEYWORDS):]], -- ripgrep regex
-- pattern = [[\b(KEYWORDS)\b]], -- match without the extra colon. You'll likely get false positives
},
},
event = { "BufRead", "BufEnter" },
dependencies = "nvim-telescope/telescope.nvim",
-- stylua: ignore
keys = {
{ ']t', function() require('todo-comments').jump_next() end, desc = 'Next todo comment' },
{ '[t', function() require('todo-comments').jump_prev() end, desc = 'Previous todo comment' },
{ '<leader>Tt', '<cmd>TodoTrouble<CR>', desc = 'Todo (Trouble)' },
{ '<leader>TT', '<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>', desc = 'Todo/Fix/Fixme (Trouble)' },
{ '<leader>Tt', '<cmd>TodoTelescope<cr>', desc = 'Todo' },
{ '<leader>TT', '<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>', desc = 'Todo/Fix/Fixme' },
},
opts = { signs = false },
},

--╞═══════════════════════════════════════════════════════════════╡
{
"sQVe/sort.nvim",
Expand Down
7 changes: 4 additions & 3 deletions lua/resources/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ return {
opts = {
{
name = "Tech",
path = "/home/tlh/DB/Wiki/",
path = "/home/tlh/Wiki/",
},
{
name = "SanatanaDharma",
path = "/home/tlh/DB/HinduismWiki",
path = "/home/tlh/HinduismWiki",
},
},
keys = {
Expand Down Expand Up @@ -82,7 +82,7 @@ return {
-- You can change it to whatever you want (eg. some nerd fonts icon), 'N' is default
filetype = "md",
git_branch_recognizable = false, -- If true, quicknote will separate notes by git branch
-- But it should only be used with residen
-- But it should only be used with resident mode
})
end,
dependencies = { "nvim-lua/plenary.nvim" },
Expand Down Expand Up @@ -268,6 +268,7 @@ return {
r = { "<cmd>CBrrbox5<cr>", "right aligned fixed size box with left aligned text" },
c = { "<cmd>CBccbox5<cr>", "center aligned fixed size box with center aligned text" },
},

x = {
name = "Trouble",
x = { "<cmd>TroubleToggle<cr>", "Trouble Toggle" },
Expand Down
3 changes: 0 additions & 3 deletions lua/resources/lang/clangd.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ return {
fname
) or require("lspconfig.util").find_git_ancestor(fname)
end,
capabilities = {
offsetEncoding = { "utf-16" },
},
cmd = {
"clangd",
"--background-index",
Expand Down
17 changes: 15 additions & 2 deletions lua/resources/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ return {
ensure_installed = {
-- LSPs
"bash-language-server",
"clangd",
"jdtls",
"dockerfile-language-server",
"json-lsp",
"marksman",
Expand Down Expand Up @@ -248,8 +250,8 @@ return {
-- formatters
{
"nvimtools/none-ls.nvim",
-- event = { "BufReadPre", "BufNewFile" },
dependencies = { "mason.nvim" },
event = { "BufReadPre", "BufNewFile" },
dependencies = { "mason.nvim", "jay-babu/mason-null-ls.nvim" },
root_has_file = function(files)
return function(utils)
return utils.root_has_file(files)
Expand Down Expand Up @@ -332,6 +334,17 @@ return {
end,
config = function(_, opts)
local null_ls = require("null-ls")
local mason_null_ls = require("mason-null-ls")

mason_null_ls.setup({
ensure_installed = {
"prettier", -- prettier formatter
"stylua", -- lua formatter
"black", -- python formatter
"pylint", -- python linter
"eslint", -- js linter
},
})
null_ls.setup(opts)
end,
},
Expand Down
Loading

0 comments on commit bbcce37

Please sign in to comment.