diff options
| author | Eugene Triguba <eugene.triguba@paymentworks.com> | 2025-05-27 10:22:57 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugene.triguba@paymentworks.com> | 2025-05-27 10:22:57 -0400 |
| commit | b1af5eb5a088bb97818bd53881a0b53e15c388bc (patch) | |
| tree | 2eafd60854f5d02ced94a07aa681aa015407501e | |
| parent | set term to be xterm-256-color (diff) | |
| parent | update nvim config (diff) | |
| download | dotfiles-b1af5eb5a088bb97818bd53881a0b53e15c388bc.zip | |
Merge branch 'main' of github.com:eugenetriguba/dotfiles
| -rw-r--r-- | nvim/.config/nvim/after/ftplugin/makefile.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lazy-lock.json | 22 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/config/keymaps.lua | 6 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/lint.lua | 6 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/lsp.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/tokyonight.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/tree-sitter.lua | 23 |
7 files changed, 26 insertions, 37 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 fef9399..74bb628 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,29 +1,29 @@ { "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, - "conform.nvim": { "branch": "master", "commit": "a4bb5d6c4ae6f32ab13114e62e70669fa67745b9" }, + "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "ee0606259ee5d5dd40398be26755048e8965086e" }, + "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "5a7cabf8e4a174c22351cbbdbe50310ee2172243" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ce0e87c0be12e7c48296a7513e90430e3eac7f24" }, + "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "d3ada78a941ff09d21dd9b4c2ec36f0cf44a4ccb" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, - "mason.nvim": { "branch": "main", "commit": "9eaedb864cdadc29c6eb7d761a6c0d8aee26c91b" }, - "mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "mini.nvim": { "branch": "main", "commit": "ecbb9b1e2223a04171388887765e7695f5a0c132" }, "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, - "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, + "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" }, + "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" }, "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" }, + "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" }, + "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua index f1b3338..617f3b9 100644 --- a/nvim/.config/nvim/lua/config/keymaps.lua +++ b/nvim/.config/nvim/lua/config/keymaps.lua @@ -26,12 +26,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/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index 470efeb..f7c9b90 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -149,7 +149,7 @@ return { group = vim.api.nvim_create_augroup('lsp-detach', { clear = true }), callback = function(event2) vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + vim.api.nvim_clear_autocmds { group = 'lsp-highlight', buffer = event2.buf } end, }) end diff --git a/nvim/.config/nvim/lua/plugins/tokyonight.lua b/nvim/.config/nvim/lua/plugins/tokyonight.lua index 7032691..b19aecb 100644 --- a/nvim/.config/nvim/lua/plugins/tokyonight.lua +++ b/nvim/.config/nvim/lua/plugins/tokyonight.lua @@ -14,7 +14,7 @@ return { -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-moon' + vim.cmd.colorscheme 'tokyonight' end, }, } diff --git a/nvim/.config/nvim/lua/plugins/tree-sitter.lua b/nvim/.config/nvim/lua/plugins/tree-sitter.lua index c9f81f5..cdcf66f 100644 --- a/nvim/.config/nvim/lua/plugins/tree-sitter.lua +++ b/nvim/.config/nvim/lua/plugins/tree-sitter.lua @@ -1,23 +1,12 @@ +-- 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', -- Autoinstall languages that are not installed auto_install = true, highlight = { @@ -25,9 +14,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: |