diff --git a/lazy-lock.json b/lazy-lock.json index 986c1da..e6933c0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,56 +1,55 @@ { - "ChatGPT.nvim": { "branch": "main", "commit": "f081338f07216a46d3915ce46c1fcb083bcb5016" }, - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, - "auto-session": { "branch": "main", "commit": "4b0728715e674ad9c18f1519127dcaed59f9981b" }, - "barbar.nvim": { "branch": "master", "commit": "d181f2cfd4b828f9c6f1e10e69c68241de59f54f" }, - "catppuccin": { "branch": "main", "commit": "47bd419c0cb776cb0a67ebb525891eca44020b59" }, + "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, + "auto-session": { "branch": "main", "commit": "3cd531ce4d46fb156268ddedf5f3e6822ef26af7" }, + "barbar.nvim": { "branch": "master", "commit": "7c28de8c22f4c00ed43a78ae16c13dd6a248fe1a" }, + "catppuccin": { "branch": "main", "commit": "ea02cc8c3c053c6c1c574e0791d743338e3e788f" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "dashboard-nvim": { "branch": "master", "commit": "e6e33b848f0e2fe5c13f6553c568764555c390a3" }, + "codeium.vim": { "branch": "main", "commit": "8c01979323b2b480c8bf160d3ff85bd1668baa49" }, + "dashboard-nvim": { "branch": "master", "commit": "d2c5a4d1341f5ca1ed2ecb4ecfcff2bc8ea18b14" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, - "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, - "gitsigns.nvim": { "branch": "main", "commit": "375c44bdfdde25585466a966f00c2e291db74f2d" }, + "dracula.nvim": { "branch": "main", "commit": "94fa7885a06a67f0a8bfa03e064619d05d1ba496" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" }, "hardhacker": { "branch": "main", "commit": "558d365d2678b5efa661310cc3b991486dcc78df" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "d1de92dffab5a862332fdd1892889d362369c12f" }, - "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" }, - "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, + "lspkind-nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, + "lspsaga.nvim": { "branch": "main", "commit": "d027f8b9c7c55e26cf4030c8657a2fc8222ed762" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, - "nordic.nvim": { "branch": "main", "commit": "03fcff3c8d68049b8118047784746048b4a08049" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nordic.nvim": { "branch": "main", "commit": "1ee4044077059b34eacd18d93613495a602c131f" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, + "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" }, - "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, - "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, - "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, + "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "52638640ae309cacdaff785fdbb854437bd1ee5c" }, + "nvim-lspconfig": { "branch": "master", "commit": "84f867753f659bfd9319f75bd5eb273a315f2da5" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-tree.lua": { "branch": "master", "commit": "12a9a995a455d2c2466e47140663275365a5d2fc" }, - "nvim-treesitter": { "branch": "master", "commit": "656ac242338d3d78a5e64d2b3b7f06892aeabfea" }, - "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" }, + "nvim-tree.lua": { "branch": "master", "commit": "2a268f631da85e83b7a95291be589bcddfc785d8" }, + "nvim-treesitter": { "branch": "master", "commit": "df20c049694474021cffb2cc8687c809adc1cbba" }, + "nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "rose-pine": { "branch": "main", "commit": "dded5c15e9d27ac95ad1e803b35a752d80f3f42b" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "rose-pine": { "branch": "main", "commit": "d396005db5bbd1d4ec7772a7c96c96f4c4802328" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, - "synthwave": { "branch": "main", "commit": "b07254dc7da67e5a373a19c7ce4376b35e798ee2" }, + "synthwave": { "branch": "main", "commit": "d638ea221b4c6636978f49c1987d10ff2733c23d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, + "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, "tint.nvim": { "branch": "master", "commit": "02bd0527a315a80e4e25bb2dd7b6994fb0daae01" }, - "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "tokyonight.nvim": { "branch": "main", "commit": "66a272ba6cf93bf303c4b7a91b100ca0dd3ec7bd" }, - "trouble.nvim": { "branch": "main", "commit": "4453fea6bb597830fbd58d2c484612f37b97bd8c" }, - "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, - "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" }, + "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, + "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, + "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } -} \ No newline at end of file +} diff --git a/lua/lazy-config/init.lua b/lua/lazy-config/init.lua index 24403f0..05f6ac5 100644 --- a/lua/lazy-config/init.lua +++ b/lua/lazy-config/init.lua @@ -16,6 +16,7 @@ vim.g.maplocalleader = "\\" local plugins = { { "kyazdani42/nvim-tree.lua" }, + { "echasnovski/mini.icons", version = "*" }, { "rcarriga/nvim-notify" }, { "nvim-lualine/lualine.nvim" }, { "romgrk/barbar.nvim" }, @@ -77,19 +78,10 @@ local plugins = { { "theHamsta/nvim-dap-virtual-text" }, { "nvim-neotest/nvim-nio" }, - --> AI + -- --> AI { - "jackMort/ChatGPT.nvim", - event = "VeryLazy", - config = function() - require("chatgpt").setup() - end, - dependencies = { - "MunifTanjim/nui.nvim", - "nvim-lua/plenary.nvim", - "folke/trouble.nvim", - "nvim-telescope/telescope.nvim", - }, + "Exafunction/codeium.vim", + event = "BufEnter", }, --> Lsp diff --git a/lua/lsp-config/lsp.lua b/lua/lsp-config/lsp.lua index 3273eac..ebdc5c2 100644 --- a/lua/lsp-config/lsp.lua +++ b/lua/lsp-config/lsp.lua @@ -12,16 +12,10 @@ local on_attach = function(client, bufnr) local opts = { noremap = true, silent = true } buf_set_keymap("n", "gd", ":lua vim.lsp.buf.definition()", opts) --> jumps to the definition of the symbol under the cursor - buf_set_keymap("n", "lh", ":lua vim.lsp.buf.hover()", opts) --> information about the symbol under the cursos in a floating window buf_set_keymap("n", "gi", ":lua vim.lsp.buf.implementation()", opts) --> lists all the implementations for the symbol under the cursor in the quickfix window - buf_set_keymap("n", "rn", ":lua vim.lsp.util.rename()", opts) --> renaname old_fname to new_fname - buf_set_keymap("n", "ca", ":lua vim.lsp.buf.code_action()", opts) --> selects a code action available at the current cursor position buf_set_keymap("n", "gr", ":lua vim.lsp.buf.references()", opts) --> lists all the references to the symbl under the cursor in the quickfix window - buf_set_keymap("n", "ld", ":lua vim.diagnostic.open_float()", opts) buf_set_keymap("n", "[d", ":lua vim.diagnostic.goto_prev()", opts) buf_set_keymap("n", "]d", ":lua vim.diagnostic.goto_next()", opts) - buf_set_keymap("n", "lq", ":lua vim.diagnostic.setloclist()", opts) - buf_set_keymap("n", "lf", ":lua vim.lsp.buf.format {async = true}", opts) --> formats the current buffer end ---@diagnostic disable-next-line: undefined-global @@ -34,88 +28,29 @@ local lsp_flags = { debounce_text_changes = 150, } -require("lspconfig")["pyright"].setup({ - on_attach = on_attach, - capabilities = capabilities, - flags = lsp_flags, -}) - -require("lspconfig")["lua_ls"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["clangd"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["bashls"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - --- require("lspconfig")["terraform_lsp"].setup({ --- on_attach = on_attach, --- capabilities = capabilities, --- }) - -require("lspconfig")["terraformls"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["tflint"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["rust_analyzer"].setup({ - on_attach = on_attach, - capabilities = capabilities, - flags = lsp_flags, - settings = { - ["rust-analyzer"] = {}, - }, -}) - -require("lspconfig")["yamlls"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["gopls"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["golangci_lint_ls"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["tsserver"].setup({ - on_attach = on_attach, - capabilities = capabilities, - flags = lsp_flags, -}) - -require("lspconfig")["emmet_ls"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["eslint"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) - -require("lspconfig")["quick_lint_js"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) +local servers = { + "pyright", + "lua_ls", + "clangd", + "bashls", + -- "terraform_lsp" + "terraformls", + "tflint", + "rust_analyzer", + "yamlls", + "gopls", + "golangci_lint_ls", + "ts_ls", + "emmet_ls", + "eslint", + "quick_lint_js", + "ltex", +} -require("lspconfig")["ltex"].setup({ - on_attach = on_attach, - capabilities = capabilities, -}) +for _, lsp in ipairs(servers) do + require("lspconfig")[lsp].setup({ + on_attach = on_attach, + capabilities = capabilities, + flags = lsp_flags, + }) +end diff --git a/lua/mappings/init.lua b/lua/mappings/init.lua index d662ddb..425c3d7 100644 --- a/lua/mappings/init.lua +++ b/lua/mappings/init.lua @@ -12,6 +12,7 @@ map("n", "", "k", { noremap = true, silent = false }) map("v", "<", "", "", 'copilot#Accept("")', { silent = true, expr = true }) +map("i", "", "codeium#Accept()", { silent = true, expr = true }) map("n", "", "zz", { noremap = true, silent = false }) map("n", "", "zz", { noremap = true, silent = false })