aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nvim/.config/nvim/after/ftplugin/makefile.lua2
-rw-r--r--nvim/.config/nvim/lazy-lock.json6
-rw-r--r--nvim/.config/nvim/lua/config/keymaps.lua6
-rw-r--r--nvim/.config/nvim/lua/plugins/lint.lua6
-rw-r--r--nvim/.config/nvim/lua/plugins/tree-sitter.lua24
5 files changed, 17 insertions, 27 deletions
diff --git a/nvim/.config/nvim/after/ftplugin/makefile.lua b/nvim/.config/nvim/after/ftplugin/makefile.lua
new file mode 100644
index 0000000..345d732
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/makefile.lua
@@ -0,0 +1,2 @@
+vim.opt_local.expandtab = false
+vim.opt_local.tabstop = 4
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 9e15b26..3f1fd49 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -13,8 +13,8 @@
"mason-tool-installer.nvim": { "branch": "main", "commit": "62f821a14e20f3f2ee358cd44d0b3d299a508e72" },
"mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
"mini.nvim": { "branch": "main", "commit": "c665f30bb372c2ec8cfd61f7531098d3658b6634" },
- "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
- "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+ "neo-tree.nvim": { "branch": "v3.x", "commit": "1ef260eb4f54515fe121a2267b477efb054d108a" },
+ "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" },
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
@@ -24,7 +24,7 @@
"nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
- "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" },
+ "nvim-web-devicons": { "branch": "master", "commit": "50b5b06bff13a9b4eab946de7c7033649a6618a1" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua
index 9c1e173..3af4d7c 100644
--- a/nvim/.config/nvim/lua/config/keymaps.lua
+++ b/nvim/.config/nvim/lua/config/keymaps.lua
@@ -16,12 +16,6 @@ map('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]ui
-- Try your own mapping or just use <C-\><C-n> to exit terminal mode
map('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
--- Disable arrow keys in normal mode
-map('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
-map('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
-map('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
-map('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
-
-- Keybinds to make split navigation easier.
-- Use CTRL+<hjkl> to switch between windows
--
diff --git a/nvim/.config/nvim/lua/plugins/lint.lua b/nvim/.config/nvim/lua/plugins/lint.lua
index 907c6bf..df2b809 100644
--- a/nvim/.config/nvim/lua/plugins/lint.lua
+++ b/nvim/.config/nvim/lua/plugins/lint.lua
@@ -6,7 +6,11 @@ return {
config = function()
local lint = require 'lint'
lint.linters_by_ft = {
- markdown = { 'markdownlint' },
+ cpp = { 'cppcheck' },
+ dockerfile = { 'hadolint' },
+ json = { 'jsonlint' },
+ terraform = { 'tflint' },
+ python = { 'ruff', 'bandit' },
}
-- To allow other plugins to add linters to require('lint').linters_by_ft,
diff --git a/nvim/.config/nvim/lua/plugins/tree-sitter.lua b/nvim/.config/nvim/lua/plugins/tree-sitter.lua
index c9f81f5..d2d7862 100644
--- a/nvim/.config/nvim/lua/plugins/tree-sitter.lua
+++ b/nvim/.config/nvim/lua/plugins/tree-sitter.lua
@@ -1,23 +1,13 @@
+-- Highlight, edit, and navigate code
return {
- { -- Highlight, edit, and navigate code
+ {
'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate',
- main = 'nvim-treesitter.configs', -- Sets main module to use for opts
+ main = 'nvim-treesitter.configs',
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
opts = {
- ensure_installed = {
- 'bash',
- 'c',
- 'diff',
- 'html',
- 'lua',
- 'luadoc',
- 'markdown',
- 'markdown_inline',
- 'query',
- 'vim',
- 'vimdoc',
- },
+ ensure_installed = 'all',
+ ignore_installed = 'norg',
-- Autoinstall languages that are not installed
auto_install = true,
highlight = {
@@ -25,9 +15,9 @@ return {
-- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
-- If you are experiencing weird indenting issues, add the language to
-- the list of additional_vim_regex_highlighting and disabled languages for indent.
- additional_vim_regex_highlighting = { 'ruby' },
+ additional_vim_regex_highlighting = { 'ruby', 'cpp' },
},
- indent = { enable = true, disable = { 'ruby' } },
+ indent = { enable = true, disable = { 'ruby', 'cpp' } },
},
-- There are additional nvim-treesitter modules that you can use to interact
-- with nvim-treesitter. You should go explore a few and see what interests you: