From 658c50336c247da455c0682eb8f5a30507daa5ec Mon Sep 17 00:00:00 2001 From: Mark Riedesel Date: Tue, 2 Jul 2024 11:40:39 -0500 Subject: [PATCH] add more nvim configs and plugins --- .config/nvim/.gitignore | 1 + .config/nvim/lazy-lock.json | 48 ------------------- .config/nvim/lua/klowner/core.lua | 5 +- .../lua/klowner/plugins/lsp/lspconfig.lua | 2 + .../nvim/lua/klowner/plugins/lsp/mason.lua | 12 ++--- .config/nvim/lua/klowner/plugins/lualine.lua | 8 +++- .../nvim/lua/klowner/plugins/whitespace.lua | 3 ++ 7 files changed, 23 insertions(+), 56 deletions(-) create mode 100644 .config/nvim/.gitignore delete mode 100644 .config/nvim/lazy-lock.json create mode 100644 .config/nvim/lua/klowner/plugins/whitespace.lua diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore new file mode 100644 index 0000000..e033bc6 --- /dev/null +++ b/.config/nvim/.gitignore @@ -0,0 +1 @@ +lazy-lock.json diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json deleted file mode 100644 index e5ebc41..0000000 --- a/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-session": { "branch": "main", "commit": "879f5b30207bd53101e1034ca91330f23746f601" }, - "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "colorizer.nvim": { "branch": "master", "commit": "7f84ba0d39b37484f5f1f838cafda9cb5241a532" }, - "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, - "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gist.nvim": { "branch": "main", "commit": "92b13e486dd9fd083750450e0d262fcc68a62b91" }, - "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "1fad61712bd3937dda925775a7736b8efbcbf1a7" }, - "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, - "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" }, - "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" }, - "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, - "nvim-unception": { "branch": "main", "commit": "a0af21a27e2ba19ce6004d57d34006d18bc6bad4" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "tagbar": { "branch": "master", "commit": "0815b5455c792a610d28ff3e7981642c9cf05d62" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "tokyonight.nvim": { "branch": "main", "commit": "30d7be361a7fbf187a881f17e574e9213d5108ea" }, - "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" }, - "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, - "vim-maximizer": { "branch": "master", "commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1" }, - "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } -} \ No newline at end of file diff --git a/.config/nvim/lua/klowner/core.lua b/.config/nvim/lua/klowner/core.lua index c9c808c..05fbe6c 100644 --- a/.config/nvim/lua/klowner/core.lua +++ b/.config/nvim/lua/klowner/core.lua @@ -23,7 +23,6 @@ opt.autoread = true -- automatically reload modified files opt.wildmenu = true -- handle autocompletion menu opt.wrap = false --- opt.list = true opt.modelines = 5 opt.matchtime = 1 @@ -40,6 +39,10 @@ opt.backspace = "indent,eol,start" -- allow backspace on indent, eol, or opt.cursorline = true opt.swapfile = false -- disable swap file +-- highlight trailing white space +vim.fn.matchadd('errorMsg', [[\s\+$]]) + + -- use system clipboard as default register opt.clipboard:append("unnamedplus") diff --git a/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua b/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua index dc11555..8caf297 100644 --- a/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua +++ b/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua @@ -132,6 +132,8 @@ return { }, }) end, + + lspconfig.gdscript.setup({}) }) end, } diff --git a/.config/nvim/lua/klowner/plugins/lsp/mason.lua b/.config/nvim/lua/klowner/plugins/lsp/mason.lua index 748229c..89cd42b 100644 --- a/.config/nvim/lua/klowner/plugins/lsp/mason.lua +++ b/.config/nvim/lua/klowner/plugins/lsp/mason.lua @@ -27,16 +27,16 @@ return { mason_lspconfig.setup({ -- list of servers for mason to install ensure_installed = { - "tsserver", - "html", "cssls", - "tailwindcss", - "svelte", - "lua_ls", - "graphql", "emmet_ls", + "graphql", + "html", + "lua_ls", "prismals", "pyright", + "svelte", + "tailwindcss", + "tsserver", }, }) diff --git a/.config/nvim/lua/klowner/plugins/lualine.lua b/.config/nvim/lua/klowner/plugins/lualine.lua index 21ce97e..3808e12 100644 --- a/.config/nvim/lua/klowner/plugins/lualine.lua +++ b/.config/nvim/lua/klowner/plugins/lualine.lua @@ -1,9 +1,15 @@ return { "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, + dependencies = { + "nvim-tree/nvim-web-devicons", + "lewis6991/gitsigns.nvim", + }, config = function () local lualine = require("lualine") local lazy_status = require("lazy.status") + local gitsigns = require("gitsigns") + + lualine.setup({ sections = { diff --git a/.config/nvim/lua/klowner/plugins/whitespace.lua b/.config/nvim/lua/klowner/plugins/whitespace.lua new file mode 100644 index 0000000..cd26bca --- /dev/null +++ b/.config/nvim/lua/klowner/plugins/whitespace.lua @@ -0,0 +1,3 @@ +return { + 'johnfrankmorgan/whitespace.nvim', +}