From 65923ed2fdd25c45f9137de0d0af737bfcc54c9c Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Wed, 3 Apr 2024 17:12:10 -0400 Subject: [PATCH] Mostly LSP config updates and plugins. --- nvim/.config/nvim/init.lua | 8 +- nvim/.config/nvim/lazy-lock.json | 112 +++++++++--------- nvim/.config/nvim/lua/core/keymaps.lua | 6 +- .../nvim/lua/custom_snippets/markdown.json | 21 +++- nvim/.config/nvim/lua/plugins/headlines.lua | 37 ++++-- nvim/.config/nvim/lua/plugins/init.lua | 100 +++++++--------- .../nvim/lua/plugins/mason-null-ls.lua | 23 ++-- nvim/.config/nvim/lua/plugins/mkdnflow.lua | 5 +- nvim/.config/nvim/lua/plugins/nvim-cmp.lua | 39 ++++++ .../nvim/lua/plugins/nvim-lspconfig.lua | 51 ++++++-- nvim/.config/nvim/spell/en.utf-8.add | 4 + nvim/.config/nvim/spell/en.utf-8.add.spl | Bin 3580 -> 3628 bytes package-lock.json | 6 + zsh/.zshrc | 5 +- 14 files changed, 258 insertions(+), 159 deletions(-) create mode 100644 package-lock.json diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index b5e3ec1..f969ff9 100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -45,10 +45,10 @@ opt.shell = "/bin/zsh" opt.updatetime = 200 opt.cursorline = true g.markdown_folding = 1 +-- g.markdown_enable_folding = 1 opt.spell=true opt.spelllang = 'en_us' cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]] -vim.api.nvim_set_hl(0, "ColorColumn", {guibg=DarkOrchid1}) ----------------------------------------------------------- -- Neovim UI ----------------------------------------------------------- @@ -100,9 +100,9 @@ vim.cmd [[ ]] vim.cmd [[ autocmd FileType python set textwidth=110 ]] vim.cmd [[ autocmd FileType lua set textwidth=80 ]] -vim.cmd [[ autocmd FileType markdown,text set textwidth=125 shiftwidth=2 ]] +vim.cmd [[ autocmd FileType markdown,text set shiftwidth=2 foldlevel=99 ]] +-- vim.cmd [[ autocmd FileType markdown setlocal foldlevel=99 ]] ---[[ local disabled_built_ins = { "netrw", "netrwPlugin", @@ -127,7 +127,6 @@ local disabled_built_ins = { for _, plugin in pairs(disabled_built_ins) do vim.g["loaded_" .. plugin] = 1 end -]]-- -- Deletes all trailing whitespaces in a file if it's not binary nor a diff. function _G.trim_trailing_whitespaces() @@ -168,4 +167,3 @@ end --]] require('core/keymaps') --- vim.cmd[[colorscheme kanagawa]] diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index b282a26..09651f7 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,92 +1,90 @@ { "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" }, - "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" }, "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "deadcolumn.nvim": { "branch": "master", "commit": "b84cdf2fc94c59651ececd5e4d2a0488b38a7a75" }, + "deadcolumn.nvim": { "branch": "master", "commit": "af13928aa281f36273e8f220b19e78d497c7fb87" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dracula.nvim": { "branch": "main", "commit": "a6cb758d4b182d9f2b7e742910078d94877c1059" }, + "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" }, - "headlines.nvim": { "branch": "master", "commit": "e3d7bfdf40e41a020d966d35f8b48d75b90367d2" }, - "hover.nvim": { "branch": "main", "commit": "4d04667cf3d6b22379e02ccef6a2fdc6e8837d56" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, + "gitsigns.nvim": { "branch": "main", "commit": "955d16e6336026a6f6b336625a03b78a58213acc" }, + "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, + "hover.nvim": { "branch": "main", "commit": "1084aa544477cf878d466cacaec0d8d4692c7360" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, + "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" }, - "link.nvim": { "branch": "main", "commit": "76fbb97e9bdc932f72669261099a76de2d576f0d" }, "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "lush.nvim": { "branch": "main", "commit": "2e8d34e748642621d761a65e3c2a198154b914e8" }, + "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, + "lush.nvim": { "branch": "main", "commit": "bc12f010b34cfeefac35720656eb777753b165d9" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "a1e19bf9baa86e8a43dd86cf9689ca9f71b4d1da" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" }, - "mini.fuzzy": { "branch": "stable", "commit": "3f4dca52f791feb5a009fecf8d519f2e391271f4" }, - "mini.hipatterns": { "branch": "main", "commit": "82d348b05328705a7048f852f15f66a482562f03" }, - "mini.move": { "branch": "main", "commit": "03a16d64e58da0a871de6493c3d8fa1101baef46" }, - "mini.pairs": { "branch": "stable", "commit": "71f117fd57f930da6ef4126b24f594dd398bac26" }, - "mini.surround": { "branch": "main", "commit": "af8129efcabe95fc08a233e9f91569829bed031f" }, - "mini.trailspace": { "branch": "main", "commit": "60d0eca6703b55285e33b0da00105cde50d188df" }, - "mkdnflow.nvim": { "branch": "main", "commit": "7b2fc47d6a3ae3b19ebc5a7eea00ea1e712f20d1" }, - "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" }, - "neovim": { "branch": "main", "commit": "9d7474f80afe2f0cfcb4fabfc5451f509d844b85" }, - "night-owl.nvim": { "branch": "main", "commit": "2b7e78c34e25aea841d10ebc3ee19d6d558e9ec0" }, - "nightfly": { "branch": "master", "commit": "56fe47bd16272d9644fd9946a2596fa2c3905c35" }, - "nightfox.nvim": { "branch": "main", "commit": "a408e6bb101066952b81de9c11be367114bd561f" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" }, + "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, + "mini.fuzzy": { "branch": "stable", "commit": "986d83dfced0dc36c442a4172bcfd7281703f269" }, + "mini.hipatterns": { "branch": "main", "commit": "0a72439dbded766af753a3e7ec0a5b21d0f8ada0" }, + "mini.move": { "branch": "main", "commit": "251d541a8ab745e81295a53c128829cb2bff18e3" }, + "mini.pairs": { "branch": "stable", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" }, + "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, + "mini.trailspace": { "branch": "main", "commit": "91f2e0c1b0ee7b72189e6f88da03da9d04077051" }, + "mkdnflow.nvim": { "branch": "main", "commit": "0a42aa3c7c2c982a1503e63ce8f0f065e0eb63df" }, + "neoscroll.nvim": { "branch": "master", "commit": "21d52973bde32db998fc8b6590f87eb3c3c6d8e4" }, + "neovim": { "branch": "main", "commit": "19055dfe90bfa46a1e5b0a706d13980bdffa2dee" }, + "night-owl.nvim": { "branch": "main", "commit": "1afa7f158feb79987ca0d017f65558492e6c8a8e" }, + "nightfly": { "branch": "master", "commit": "06cd078edc8d92ded2d37270649bd8ed23dec43d" }, + "nightfox.nvim": { "branch": "main", "commit": "e352a32e0f54feb2550ebdab815ae8f7f26ed63b" }, + "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, - "nvim": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, - "nvim-dap-python": { "branch": "master", "commit": "f5b6f3a90aae0284b61fb3565e575267c19a16e6" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim": { "branch": "main", "commit": "aebe43db9cb26e1c70fc5b2fd4158169c405e720" }, + "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, + "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, + "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" }, + "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-http": { "branch": "main", "commit": "11de61bcdf01f4728dd8d8bbcd48901d220c28cc" }, - "nvim-lspconfig": { "branch": "master", "commit": "0a1a2aa549da0d2294e072e2d725f02cca32f64e" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-lspconfig": { "branch": "master", "commit": "96e5711040df23583591391ce49e556b8cd248d8" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" }, - "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" }, - "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "nvim-tree.lua": { "branch": "master", "commit": "ddd1d6eb21c45433bdc65cc8015f2457998f2bf2" }, + "nvim-treesitter": { "branch": "master", "commit": "cc0e29727a9651e27869b7444e835c44fb1e7b4c" }, + "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, + "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "ca8d5ee2b4ee1eec491040a7601d366ddc8a2e02" }, - "rainbow_csv.nvim": { "branch": "main", "commit": "a520dabf1c74d7d7d8341dd3f3570063ef51b3aa" }, - "solarized-osaka.nvim": { "branch": "main", "commit": "f6e66670e31c09cfb7142a16d5dc2f26d2a31a40" }, - "sonokai": { "branch": "master", "commit": "42822f8f9b3a5088f05cf72a0aa1477598ad1a40" }, - "styler.nvim": { "branch": "main", "commit": "2cd29996d08cec8b31270c6de64465f716ef9d71" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "580bc045c7ab3ab3ebd267774038c0d8cc19c789" }, + "rainbow_csv.nvim": { "branch": "main", "commit": "5033e3abd4fb0a0ee07232530a032296535704b4" }, + "solarized-osaka.nvim": { "branch": "main", "commit": "92c5def2b522e7869b29b55b448544f226e07524" }, + "sonokai": { "branch": "master", "commit": "da162343354fbd9bf9cd49293a856f0e3761e8ac" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, - "telescope-cmdline.nvim": { "branch": "main", "commit": "7c92e740fd90efa7786c28876c8230ae8f16b42b" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "6dd6522bc1a4cbe5883eb0272f5cc7a54ae3858b" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-cmdline.nvim": { "branch": "main", "commit": "9d4ef3e16e117e7ce91cb335247c87fb8d744696" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "5ee5002373655fd684a4ad0d47a3de876ceacf9a" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "thethethe.nvim": { "branch": "main", "commit": "357580127cd291c8a813564eeaff07c09303084e" }, - "tmux.nvim": { "branch": "main", "commit": "ea67d59721eb7e12144ce2963452e869bfd60526" }, - "toggleterm.nvim": { "branch": "main", "commit": "cbd041d91b90cd3c02df03fe6133208888f8e008" }, - "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "tmux.nvim": { "branch": "main", "commit": "63e9c5e054099dd30af306bd8ceaa2f1086e1b07" }, + "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, + "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, + "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, + "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, "venn.nvim": { "branch": "main", "commit": "e4d68341a73dd56c64955058821a58295fb337b1" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, - "vim-wakatime": { "branch": "master", "commit": "cae21a19c3db4d9aadd5d320de3da0c99dfd0f62" }, + "vim-wakatime": { "branch": "master", "commit": "56b4d073adaf18c04c7bb5728d41c03b2f25754d" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, - "wtf.nvim": { "branch": "main", "commit": "07f79bdffaa9dd2785fe2543da6d850e76d2709c" } + "wtf.nvim": { "branch": "main", "commit": "8e7bec4d3cb2ea2e3d078b9af8c4cc68d1066c33" } } \ No newline at end of file diff --git a/nvim/.config/nvim/lua/core/keymaps.lua b/nvim/.config/nvim/lua/core/keymaps.lua index cab538a..5db6c78 100644 --- a/nvim/.config/nvim/lua/core/keymaps.lua +++ b/nvim/.config/nvim/lua/core/keymaps.lua @@ -30,7 +30,8 @@ map('n', 'q', ':SidebarNvimUpdate', default_opts) -- Telescope map('n', 'ff', ':Telescope find_files', default_opts) -map('n', 'fg', ':Telescope live_grep', default_opts) +map('n', 'fh', ':Telescope live_grep', default_opts) +map('n', 'fg', ':Telescope live_grep_args', default_opts) map('n', 'fb', ':Telescope buffers', default_opts) map('n', 'fe', ':Telescope file_browser', default_opts) map('n', 'fk', ':Telescope keymaps', default_opts) @@ -42,6 +43,9 @@ map('n', 'b', ':! black %', default_opts) map('n', 'm', ':! markdownlint -f %', default_opts) map('n', 'pj', ':!python -m json.tool', default_opts) +-- Fold all comments +map('n', 'fc', ':set foldmethod=expr foldexpr=getline(v:lnum)=~"^\\s*".&commentstring[0]', default_opts) + -- Terminal map('n', '', ':ToggleTerm direction=float', default_opts) map('t', '', '', default_opts) -- Exit Insert Mode Faster diff --git a/nvim/.config/nvim/lua/custom_snippets/markdown.json b/nvim/.config/nvim/lua/custom_snippets/markdown.json index 228b622..c254b5a 100644 --- a/nvim/.config/nvim/lua/custom_snippets/markdown.json +++ b/nvim/.config/nvim/lua/custom_snippets/markdown.json @@ -1,7 +1,18 @@ { - "todays-date": { - "prefix": "today", - "body": ["${CURRENT_MONTH}-${CURRENT_DATE}-${CURRENT_YEAR}"], - "description": "Put the date in (Y-m-D) format" - } + "today-date": { + "prefix": "today", + "body": ["${CURRENT_MONTH}-${CURRENT_DATE}-${CURRENT_YEAR}"], + "description": "Put the date in (Y-m-D) format" + }, + "today-tasks": { + "prefix": "todaytask", + "body": ["## ${CURRENT_MONTH}-${CURRENT_DATE}-${CURRENT_YEAR} \n\n- [ ] "], + "description": "Today's date plus a markdown task for easy addition." + }, + "box": { + "prefix": "hugobox", + "body": ["{{< box info >}} \n\n {{< /box >}}"], + "description": "Custom info box for hugo website. Info can also be warn, tip." + + } } diff --git a/nvim/.config/nvim/lua/plugins/headlines.lua b/nvim/.config/nvim/lua/plugins/headlines.lua index a0b9a99..41ae07a 100644 --- a/nvim/.config/nvim/lua/plugins/headlines.lua +++ b/nvim/.config/nvim/lua/plugins/headlines.lua @@ -1,10 +1,10 @@ return { 'lukas-reineke/headlines.nvim', - } - --[[ config = function() - require("headlines").setup { - markdown = { - query = vim.treesitter.parse_query( + dependencies = "nvim-treesitter/nvim-treesitter", + config = function() + require("headlines").setup { + markdown = { + query = vim.treesitter.query.parse( "markdown", [[ (atx_heading [ @@ -22,17 +22,30 @@ return { (block_quote_marker) @quote (block_quote (paragraph (inline (block_continuation) @quote))) - + ]] ), - headline_highlights = { "Headline" }, + headline_highlights = { + 'Headline1', + 'Headline2', + 'Headline3', + 'Headline4', + 'Headline5', + 'Headline6', + }, codeblock_highlight = "CodeBlock", dash_highlight = "Dash", dash_string = "-", quote_highlight = "Quote", quote_string = "┃", - fat_headlines = true, - }, + fat_headlines = false, + }, + } + vim.api.nvim_set_hl(0, 'Headline1', { fg = '#ffffff', bg = '#6272A4', italic = false }) + vim.api.nvim_set_hl(0, 'Headline2', { fg = '#000000', bg = '#8BE9FD', italic = false }) + vim.api.nvim_set_hl(0, 'Headline3', { fg = '#000000', bg = '#BD93F9', italic = false }) + vim.api.nvim_set_hl(0, 'Headline4', { fg = '#000000', bg = '#FFB86C', italic = false }) + vim.api.nvim_set_hl(0, 'Headline5', { fg = '#000000', bg = '#FF79C6', italic = false }) + vim.api.nvim_set_hl(0, 'Headline6', { fg = '#000000', bg = '#FF5555', italic = false }) + vim.api.nvim_set_hl(0, 'CodeBlock', { bg = '#222221' }) + end } -end -} ---]] diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index d6371de..16f837e 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -33,15 +33,19 @@ return { history = true, delete_check_events = "TextChanged", }) + require("luasnip").filetype_extend("liquid", {"html","css","javascript"}) require("luasnip.loaders.from_vscode").lazy_load() require("luasnip.loaders.from_vscode").load({ paths = { - "~/.dotfiles/nvim/.config/nvim/lua/custom_snippets/" } + "~/.dotfiles/nvim/.config/nvim/lua/custom_snippets/" } }) + -- require("luasnip.extras.filetype_functions").extend_load_ft({ + -- liquid = {"html", "css", "javascript" }, + -- }) end, }, - {"ellisonleao/glow.nvim", config = function() require("glow").setup() end }, + -- {"ellisonleao/glow.nvim", config = function() require("glow").setup() end }, 'saadparwaiz1/cmp_luasnip', 'hrsh7th/cmp-nvim-lsp-signature-help', @@ -86,7 +90,7 @@ return { always_divide_middle = false, }, sections = { - lualine_x = { "encoding", { "fileformat", symbols = { unix = "" } }, "filetype" }, + lualine_x = { "encoding", { "fileformat", symbols = { unix = " " } }, "filetype" }, }, }) end, @@ -162,20 +166,6 @@ return { } end }, --- Styler - for per filetype colorschemes - { - "folke/styler.nvim", - config = function() - require("styler").setup({ - themes = { - -- md = { colorscheme = "kanagawa" }, - -- python = { colorscheme = "catppuccin" }, - -- javascript = { colorscheme = "dracula" }, - -- html = { colorscheme = "tokyonight" }, - }, - }) - end, - }, "hrsh7th/nvim-cmp", -- optional, for completion "ggandor/lightspeed.nvim", @@ -253,10 +243,6 @@ return { local hipatterns = require('mini.hipatterns') hipatterns.setup({ highlighters = { - fixme = { pattern = '%f[%w]()FIXME()%f[%W]', group = 'MiniHipatternsFixme' }, - hack = { pattern = '%f[%w]()HACK()%f[%W]', group = 'MiniHipatternsHack' }, - todo = { pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' }, - note = { pattern = '%f[%w]()NOTE()%f[%W]', group = 'MiniHipatternsNote' }, hex_color = hipatterns.gen_highlighter.hex_color(), hsl_color = { pattern = "hsl%(%d+,? %d+,? %d+%)", @@ -344,40 +330,40 @@ return { 'nvim-lua/plenary.nvim', -- Todo & Comments for Organization - -- { - -- 'folke/todo-comments.nvim', - -- dependencies = "nvim-lua/plenary.nvim", - -- config = function() - -- require("todo-comments").setup { - -- 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 - -- }, - -- DONE = { icon = " ", color = "info" }, - -- IN_PROG = { icon = "󰇘", color = "default" }, - -- FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } }, - -- WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } }, - -- TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } }, - -- RISK = { icon = " ", color = "hint", alt = { "RISK" } }, - -- SENG = { icon = " ", color = "test", alt = { "SOLUTIONS", "SE", "WORKAROUND" } }, - -- }, - -- highlight = { - -- comments_only = false, - -- }, - -- colors = { - -- error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, - -- warning = { "DiagnosticWarning", "WarningMsg", "#FBBF24" }, - -- info = { "DiagnosticInfo", "#2563EB" }, - -- hint = { "DiagnosticHint", "#10B981" }, - -- default = { "Identifier", "#7C3AED" }, - -- test = { "Identifier", "#FF00FF" } - -- }, - -- } - -- end - -- }, + { + 'folke/todo-comments.nvim', + dependencies = "nvim-lua/plenary.nvim", + config = function() + require("todo-comments").setup { + 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 + }, + DONE = { icon = " ", color = "info" }, + IN_PROG = { icon = "󰇘", color = "default" }, + FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } }, + WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } }, + TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } }, + RISK = { icon = " ", color = "hint", alt = { "RISK" } }, + GOAL = { icon = " ", color = "test", alt = { "GOAL", "KPI"} }, + }, + highlight = { + comments_only = false, + }, + colors = { + error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, + warning = { "DiagnosticWarning", "WarningMsg", "#FBBF24" }, + info = { "DiagnosticInfo", "#2563EB" }, + hint = { "DiagnosticHint", "#10B981" }, + default = { "Identifier", "#7C3AED" }, + test = { "Identifier", "#FF00FF" } + }, + } + end + }, -- Various telescopes 'nvim-telescope/telescope-file-browser.nvim', @@ -391,8 +377,8 @@ return { ----------------------------------------------------------- { 'rktjmp/lush.nvim' }, - { 'normanras/link.nvim' }, - { dir = '/Users/normrasmussen/Documents/Projects/link-two/', lazy = true}, + -- { 'normanras/link.nvim' }, + -- { dir = '/Users/normrasmussen/Documents/Projects/link-two/', lazy = true}, { "craftzdog/solarized-osaka.nvim", lazy = false, diff --git a/nvim/.config/nvim/lua/plugins/mason-null-ls.lua b/nvim/.config/nvim/lua/plugins/mason-null-ls.lua index d242d5a..5155700 100644 --- a/nvim/.config/nvim/lua/plugins/mason-null-ls.lua +++ b/nvim/.config/nvim/lua/plugins/mason-null-ls.lua @@ -14,16 +14,19 @@ return { null_ls.setup({ debug = true, sources = { - null_ls.builtins.diagnostics.markdownlint.with({ - extra_args = { "--disable", "MD024", "MD013", "MD012", "--" }}), - null_ls.builtins.formatting.black, - null_ls.builtins.completion.luasnip, - null_ls.builtins.code_actions.gitsigns, - null_ls.builtins.diagnostics.pylint.with({ - diagnostics_postprocess = function(diagnostic) - diagnostic.code = diagnostic.message_id - end, - }), + -- null_ls.builtins.diagnostics.markdownlint.with({ + -- extra_args = { "--disable", "MD024", "MD013", "MD012", "--" }}), + -- null_ls.builtins.formatting.black, + -- null_ls.builtins.completion.luasnip, + -- null_ls.builtins.code_actions.gitsigns, + -- null_ls.builtins.diagnostics.ruff, + -- null_ls.builtins.formatting.ruff, + -- null_ls.builtins.formatting.prettierd, + -- null_ls.builtins.diagnostics.pylint.with({ + -- diagnostics_postprocess = function(diagnostic) + -- diagnostic.code = diagnostic.message_id + -- end, + -- }), }, }) end diff --git a/nvim/.config/nvim/lua/plugins/mkdnflow.lua b/nvim/.config/nvim/lua/plugins/mkdnflow.lua index 7136a0c..85db976 100644 --- a/nvim/.config/nvim/lua/plugins/mkdnflow.lua +++ b/nvim/.config/nvim/lua/plugins/mkdnflow.lua @@ -4,8 +4,9 @@ return { require('mkdnflow').setup({ mappings = { MkdnToggleToDo = {{'i', 'n'}, ''}, - MkdnNewListItem = {{'i'}, ''}, - MkdnEnter = {{'n'}, ''}, + MkdnEnter = {{'i', 'n', 'v'}, ''}, + MkdnExtendList = {{'n'}, ';'}, + MkdnNewListItemBelowInsert = {{'n', 'i'}, 'l'}, MkdnTableNextCell = false, MkdnTab = {{'i',}, ''}, MkdnSTab = {{'i'}, ''}, diff --git a/nvim/.config/nvim/lua/plugins/nvim-cmp.lua b/nvim/.config/nvim/lua/plugins/nvim-cmp.lua index d5c6563..4a36a0b 100644 --- a/nvim/.config/nvim/lua/plugins/nvim-cmp.lua +++ b/nvim/.config/nvim/lua/plugins/nvim-cmp.lua @@ -128,5 +128,44 @@ return { require'lspconfig'.pylsp.setup { capabilities = capabilities } + local lspconfig = require'lspconfig' + local configs = require'lspconfig.configs' + + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + + if not configs.ls_emmet then + configs.ls_emmet = { + default_config = { + cmd = { 'ls_emmet', '--stdio' }; + filetypes = { + 'html', + 'liquid', + 'css', + 'scss', + 'javascriptreact', + 'typescriptreact', + 'haml', + 'xml', + 'xsl', + 'pug', + 'slim', + 'sass', + 'stylus', + 'less', + 'sss', + 'hbs', + 'handlebars', + }; + root_dir = function(fname) + return vim.loop.cwd() + end; + settings = {}; + }; + } + end + require'lspconfig'.ls_emmet.setup { + capabilities = capabilities + } end } diff --git a/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua index db5096f..e29eb6d 100644 --- a/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua +++ b/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua @@ -2,22 +2,21 @@ return { 'neovim/nvim-lspconfig', config = function() -- Setup language servers. - local lspconfig = require('lspconfig') - lspconfig.pylsp.setup {} + local lspconfig = require('lspconfig') + local configs = require('lspconfig.configs') + lspconfig.pylsp.setup{ -- Server-specific settings. See `:help lspconfig-setup` settings = { settings = { pylsp = { - configurationSources = {"pylint"}, - plugins = { - pylint = { enabled = true }, - flake8 = { enabled = false }, - pycodestyle = { enabled = false }, - pyflakes = { enabled = false }, + configurationSources = {"pylint"}, + plugins = { + pylint = { enabled = true }, } } } } + } -- Global mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions vim.keymap.set('n', 'e', vim.diagnostic.open_float) @@ -55,5 +54,39 @@ return { end, opts) end, }) - end + + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + + if not configs.ls_emmet then + configs.ls_emmet = { + default_config = { + cmd = { 'ls_emmet', '--stdio' }; + filetypes = { + 'html', + 'liquid', + 'css', + 'scss', + 'javascriptreact', + 'typescriptreact', + 'haml', + 'xml', + 'xsl', + 'pug', + 'slim', + 'sass', + 'stylus', + 'less', + 'sss', + 'handlebars', + }; + root_dir = function(fname) + return vim.loop.cwd() + end; + settings = {}; + }; + } + end + lspconfig.ls_emmet.setup { capabilities = capabilities } + end } diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add index 46a4f45..00afd89 100644 --- a/nvim/.config/nvim/spell/en.utf-8.add +++ b/nvim/.config/nvim/spell/en.utf-8.add @@ -339,3 +339,7 @@ BirdNET reseller Ece accredation +assesment +submodules +Artera +Qualtrics diff --git a/nvim/.config/nvim/spell/en.utf-8.add.spl b/nvim/.config/nvim/spell/en.utf-8.add.spl index af4aac027f8c427c4c27e0b894b1be555c05c637..a2352d7c927db3bdfd340ea3f90df7f3e9116524 100644 GIT binary patch delta 1466 zcmYLJO^91n6u#%apG*>&(xOI~#F3^pGhoXYTLqB;EfuVG;SU3KigNSb%j6~RC%m6b zA{C{$5kasQbRnpnO*eu}>`q3Tg|iarLg=D&UzDB?34jo;0ta#kKtTo`G}xBPbcCA}LVQPLI+M*- z*O6|9kvnbOQp)1_Dm&O^BAZ{4h?^d}IY-lw_DW=bRzk!rURpu97Jlqmgtn zOfbL%)E$@#S7(N{nUQ5xUp3A>bHl@L5jlkCXRlA2b_3ngnd>yOlpn;&A@rf#7?8{M zHM4dE5%&=xl}6J9!V%fDe=I{IdYCn=sC z@^V{$Z&fZ#l%>!m>c;)t@G}rbX=Kb8NQssarP(2NWj)|-%())zmVM+MBd;hMc@^-7 zUbO3#zkQw$K{8eXEEkjSg1%%gJ`A=4J)F5qVV4iXC;DT1^{K6tI*o!vdbr-BAqcl; zw44}+n;;BKQu8nx3q4Cpk_3kS-jE^ttNu1H?uB$X`8lh*-6T zCf0l$J)O}Fk`HEv@?zN~SHs+70MPXekx&~f!hQYz+$rxE4{kZJ(C$7-uO<#_wS_ru zhB=lXM*qL2j;TC9W`@vdCAE~(PY2j1#x*-h z`a_@e=K3@rYn}fqQO;bn8MAdEvHdW@InBU17X+BiwaVcJEupm^BJ$dNGLvQ|EdR(NJqImEStyK$e}K_j`Yy=Xu|E zzNsI*GIR5twLJ6VcGRY& zF%Bq}J{zd6@51fQfvlg5jkl66%mck3uhU2;@&fJaeYr-@^lx&JHng;Eo})o%359ga zIfA)r$hkIjX3d@!e=1aSC-s&JK4|EB*4x2XJ{L$`>1PvU%X}!B3vkUR?&G4QqPX1w z8=QDMGU##qAOS7rpx7LyGU_5j%Mw!JeY8Lsc?Jf*=@q+PeWa*uyul=}=jl*?YR`Sx z$ly=IX2G|CA0C(4glCSQhZtnoJ&t@7Q4^v@6R`JM@amZ=jDm(8+iw?LfFdEQ`h`6| zRZ9%pp?`LL{uC7Qf9!l;AFQm4h}5dYa&+nH61I1$j@e zIJ0MekBsalXg)@L<_;o>b7@xmbgrGcle6S$+>t)+Kk4VrnYT{* z@J5wI?wV|P28l=u$Mb`zok_tF%0gR(y`Muw_-;oOaQ2a2EuWzu^!w$j@e0S&ppeo| z4LIM(K!={S$<;7z+!|I~jJ^M-+WN8wBL`bMIbf$!l2=p2o(8@S4i50rTn(s zGOmAbn`*S-TLOH=vT5lvUwQ!$@-##&VAI28^)_HD(hsL@660~S+ z!gxQil^?ZDM_{{{mz103JtTwMQYd}Xxd$Dzd?J|m+2a`*>MPSt`a*v;eHp9ya2kyY zP%weK2wcu(fLq!&!qLFY@qJ!_47AM19`>n=MAj1p#r`>{oLe08o{L?d+7i6wW?*(E z0SWUl8K#q_{;Jn17i(`SgD3}Qme)D0cPsUojYKNnaw9Xfq5isZDT<9GUc?fV*3D-q z?V46J%~Y1Ib(|$;S6`>+ P`lxz=_P#rR;wAYXz+^3$ diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..0350754 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": ".dotfiles", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/zsh/.zshrc b/zsh/.zshrc index b9c37c5..35c67cc 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -13,7 +13,9 @@ export LANG=en_US.UTF-8 export DOT="~/.dotfiles" alias vim='vim -S ~/.vimrc' alias nvim='nvim' - alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew' +alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew' +export CLICOLOR=1 +export LSCOLORS=ExGxBxDxCxEgEdxbxgxcxd export EDITOR="$VISUAL" export VISUAL='nvim' @@ -64,3 +66,4 @@ source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh source ~/.dotfiles/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh source ~/.dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +. "$HOME/.cargo/env"