diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | lazy-lock.json | 19 | ||||
| -rw-r--r-- | lua/tjk/options.lua | 8 | ||||
| -rw-r--r-- | lua/tjk/plugins/colorizer.lua | 1 | ||||
| -rw-r--r-- | lua/tjk/plugins/indentblankline.lua | 8 | ||||
| -rw-r--r-- | lua/tjk/plugins/lsp.lua | 1 | ||||
| -rw-r--r-- | lua/tjk/plugins/snacks.lua | 15 | ||||
| -rw-r--r-- | lua/tjk/plugins/treesitter.lua | 2 |
8 files changed, 43 insertions, 12 deletions
@@ -1,2 +1 @@ -lazy-lock.json .netrwhist diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..9cf3ffc --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,19 @@ +{ + "autoclose.nvim": { "branch": "main", "commit": "3f86702b54a861a17d7994b2e32a7c648cb12fb1" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, + "cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" }, + "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" }, + "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, + "minitab.nvim": { "branch": "master", "commit": "f6183e8cb6f408e54dd5d1d13c0075376655a3ec" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-lspconfig": { "branch": "master", "commit": "d9879110d0422a566fa01d732556f4d5515e1738" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "687ef75fdbd497eabc9eea92b52e7b4d403b3319" }, + "snacks.nvim": { "branch": "main", "commit": "7e3c655bec091e39d35ce950a41efd52c6341801" } +} diff --git a/lua/tjk/options.lua b/lua/tjk/options.lua index 945536a..3b52283 100644 --- a/lua/tjk/options.lua +++ b/lua/tjk/options.lua @@ -9,6 +9,10 @@ opt.termguicolors = true -- truecolor in terminal emulator, will be disa opt.wrap = false -- disable word wrapping opt.cursorline = true -- highlight current line opt.title = true -- set window title of the terminal emulator to current nvim buffer +vim.cmd.aunmenu "PopUp" -- disable right click menu + +-- TODO remove this when issue #32660 is fixed by #33145 +vim.g._ts_force_sync_parsing = true -- line numbers opt.number = true -- enable line numbers @@ -16,7 +20,7 @@ opt.relativenumber = true -- enable relative line numbers -- show whitespace characters opt.list = true -- show whitespace characters defined in listchars -opt.listchars = "tab:▏ ,space:·" -- highlight tabs and spaces +opt.listchars = "tab:│ ,space:·" -- highlight tabs and spaces -- tabbing opt.tabstop = 4 -- set tabwidth to 4 instead of 8 @@ -28,7 +32,7 @@ opt.smartcase = true -- ...unless the search term is capital -- experimental opt.smartindent = true ---opt.wildmode = "longest:list:full" -- Better auto-complete +opt.wildmode = "list:longest,list:full" -- Better auto-complete -- dont continue comments on to new lines (:help fo-table) api.nvim_create_autocmd("FileType", { pattern = "*", callback = function() diff --git a/lua/tjk/plugins/colorizer.lua b/lua/tjk/plugins/colorizer.lua index 964b6f4..1bdb94d 100644 --- a/lua/tjk/plugins/colorizer.lua +++ b/lua/tjk/plugins/colorizer.lua @@ -3,6 +3,7 @@ return { enabled = vim.opt.termguicolors._value, opts = { "css", + "scss", "sass", "javascript", "html", diff --git a/lua/tjk/plugins/indentblankline.lua b/lua/tjk/plugins/indentblankline.lua deleted file mode 100644 index 826f1ae..0000000 --- a/lua/tjk/plugins/indentblankline.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "lukas-reineke/indent-blankline.nvim", - enabled = vim.opt.termguicolors._value, - main = "ibl", - opts = { - scope = { enabled = false }; - } -} diff --git a/lua/tjk/plugins/lsp.lua b/lua/tjk/plugins/lsp.lua index 050a5a6..a23f7ef 100644 --- a/lua/tjk/plugins/lsp.lua +++ b/lua/tjk/plugins/lsp.lua @@ -1,5 +1,6 @@ return { "neovim/nvim-lspconfig", + enabled = false, dependencies = { "williamboman/mason.nvim", -- install lsp's "williamboman/mason-lspconfig.nvim", diff --git a/lua/tjk/plugins/snacks.lua b/lua/tjk/plugins/snacks.lua new file mode 100644 index 0000000..434cd68 --- /dev/null +++ b/lua/tjk/plugins/snacks.lua @@ -0,0 +1,15 @@ +return { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + opts = { + indent = { + enabled = true, + only_scope = true, + char = "▏", -- TODO doesn't work + animate = { enabled = false }, + scope = { enabled = false }, + }, + quickfile = { enabled = true }, + }, +} diff --git a/lua/tjk/plugins/treesitter.lua b/lua/tjk/plugins/treesitter.lua index 835e1af..54a042f 100644 --- a/lua/tjk/plugins/treesitter.lua +++ b/lua/tjk/plugins/treesitter.lua @@ -22,7 +22,7 @@ return { ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "comment", "javascript", "html", "css", "scss", "python", "php" }, auto_install = true, -- install available parsers when entering new buffers - highlight = { enable = true, disable = { "yaml" } }, + highlight = { enable = true, disable = { "yaml", "dockerfile" } }, indent = { enable = true, disable = { "yaml" } }, --playground = { enable = true }, -- treesitter debug }) |