From 0c50fe17187443a7389b5b1d8cb90d784e51b74e Mon Sep 17 00:00:00 2001 From: foozzi Date: Wed, 3 Jan 2024 13:34:39 -0500 Subject: [PATCH] 03012023 --- global/.ssh/config | Bin 472 -> 471 bytes linux/.config/nvim/lazy-lock.json | 2 ++ linux/.config/nvim/lua/plugins/conform.lua | 16 +++++++++++ .../nvim/lua/plugins/hardtime-nvim.lua | 4 ++- linux/.config/nvim/lua/plugins/lsp.lua | 26 ++++++++++++++++-- linux/.config/nvim/lua/plugins/nvim-lint.lua | 19 +++++++++++++ 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 linux/.config/nvim/lua/plugins/conform.lua create mode 100644 linux/.config/nvim/lua/plugins/nvim-lint.lua diff --git a/global/.ssh/config b/global/.ssh/config index fa81f5949495d6cb5f6173b3758e0537d059f0c4..879b2b80a5b2080056117d999af315a4e741d703 100644 GIT binary patch literal 471 zcmV;|0Vw_eM@dveQdv+`02$o`)cwWG;n~^&z6oob&rYTOw&<(rn+=VQU~MU_doUpX z5d#8dxn{2YMqfiysQjYOLA3XjWQc;S&Qx+iw=oAyi=y0I>2DH3d$n}INtLb2GBSPi zK>gJF5vX7B&}vDK)omjgG|12eean1Y0f^1K+u!42irs`=cNDq4wKZ85%GbB}dj@TN zk1v~Qpa%bwQI&^9PzR3U+ zGz{ym&9h?T;?IxY19kFv143>A`H#c^LIgbg=m4IDF%h~$sCdIfaN|}q4 zCzp|1?ec$b=k9h66!}HVQ^zVG(F!8c%gLHQrHa+^5!P@;o~(;v7{K|+$>cv_LGFq; z^98)U1oFFugl{_nyi`TP2G;#x*)C<< NOGE$;JZY`%Uc5;i?3(}p literal 472 zcmV;}0Vn>&Uj2E9qWg#Z3Be?c^26+w#p) zhkR1tb3Mv+afotj9G!@<_Wl{IpEf47!xj z1$^vKwS?gzQ!y0apbH4~vT$)lV$irsK362RHlPzno(t~SpTRPw8@0LE^&5x+H!S!j z#EgF~j}}#VDz~qUccuZyVMbD?G$((gjFOp26(|iQ>U^mzytc+J(I|yw z>dGnbbFj(QE$mCX87!H$Rfo0IaFvIjppam?=+Nf8J>1bGwVZJ#-g@0sFFuxfO zix}5L<6erE53s^DE9iFqG-KnQW_6|iA&+ZVLr!XTY*udVuDE%RA|)`uenK%_fivWL Opd2wxlL;ga!RaT<-05Hd diff --git a/linux/.config/nvim/lazy-lock.json b/linux/.config/nvim/lazy-lock.json index d7d2e09..fcc474d 100644 --- a/linux/.config/nvim/lazy-lock.json +++ b/linux/.config/nvim/lazy-lock.json @@ -5,6 +5,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "conform.nvim": { "branch": "master", "commit": "c4b2efb8aee4af0ef179a9b49ba401de3c4ef5d2" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, @@ -18,6 +19,7 @@ "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lint": { "branch": "master", "commit": "4dbc7ec60b33b656f7c54bb945671a55b18699f2" }, "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" }, "nvim-tree.lua": { "branch": "master", "commit": "50f30bcd8c62ac4a83d133d738f268279f2c2ce2" }, "nvim-treesitter": { "branch": "master", "commit": "7d0b4756aba3b220d38ec0443c6cc10944060dd7" }, diff --git a/linux/.config/nvim/lua/plugins/conform.lua b/linux/.config/nvim/lua/plugins/conform.lua new file mode 100644 index 0000000..77e90d8 --- /dev/null +++ b/linux/.config/nvim/lua/plugins/conform.lua @@ -0,0 +1,16 @@ +return { + 'stevearc/conform.nvim', + opts = { + formatters_by_ft = { + lua = { "stylua" }, + python = { "ruff_format", "ruff_fix" }, + javascript = { "biome" }, + typescript = { "biome" }, + json = { "biome" }, + jsx = { "biome" }, + sh = { "shfmt" }, + ['*'] = { 'trim_whitespace', 'codespell' }, + }, + }, + lazy = false, +} diff --git a/linux/.config/nvim/lua/plugins/hardtime-nvim.lua b/linux/.config/nvim/lua/plugins/hardtime-nvim.lua index 270a4d9..ef61172 100644 --- a/linux/.config/nvim/lua/plugins/hardtime-nvim.lua +++ b/linux/.config/nvim/lua/plugins/hardtime-nvim.lua @@ -1,6 +1,8 @@ return { "m4xshen/hardtime.nvim", dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, - opts = {}, + opts = { + max_time = 0, + }, lazy = false } diff --git a/linux/.config/nvim/lua/plugins/lsp.lua b/linux/.config/nvim/lua/plugins/lsp.lua index f20c0f0..3072b62 100644 --- a/linux/.config/nvim/lua/plugins/lsp.lua +++ b/linux/.config/nvim/lua/plugins/lsp.lua @@ -36,10 +36,15 @@ local config = function() vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) - vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set("n", "ca", function() vim.lsp.buf.code_action() end, opts) vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) + vim.keymap.set("n", "gi", function() vim.lsp.buf.implementation() end, opts) + -- nvim-lint + vim.keymap.set("n", "li", function() require("lint").try_lint() end, opts) + -- conform + vim.keymap.set("n", "ff", function() require("conform").format({ bufnr = bufnr }) end, opts) end) lsp_zero.set_sign_icons({ @@ -53,11 +58,13 @@ local config = function() require('mason-lspconfig').setup({ ensure_installed = { "bashls", - "tsserver", + -- "tsserver", "pyright", "lua_ls", "jsonls", "clangd", + "ruff_lsp", + "biome" }, automatic_installation = true, handlers = { @@ -109,6 +116,21 @@ local config = function() [''] = cmp.mapping.select_next_item(cmp_select), [''] = cmp.mapping.confirm({ select = true }), [''] = cmp.mapping.complete(), + [''] = cmp.mapping(function(fallback) + if luasnip.jumpable(1) then + luasnip.jump(1) + else + fallback() + end + end, {'i', 's'}), + + [''] = cmp.mapping(function(fallback) + if luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, {'i', 's'}), }), }) end diff --git a/linux/.config/nvim/lua/plugins/nvim-lint.lua b/linux/.config/nvim/lua/plugins/nvim-lint.lua new file mode 100644 index 0000000..df56731 --- /dev/null +++ b/linux/.config/nvim/lua/plugins/nvim-lint.lua @@ -0,0 +1,19 @@ +local config = function() + require('lint').linters_by_ft = { + python = { "mypy" }, + } + + vim.api.nvim_create_autocmd({ "BufWritePost" }, { + callback = function() + require("lint").try_lint() + end, + }) +end + + +return { + "mfussenegger/nvim-lint", + opts = {}, + config = config, + lazy = false, +}