diff --git a/.config/nvim/lua/plugins/avante.lua b/.config/nvim/lua/plugins/avante.lua new file mode 100644 index 0000000..255b5b6 --- /dev/null +++ b/.config/nvim/lua/plugins/avante.lua @@ -0,0 +1,46 @@ +return { + "yetone/avante.nvim", + event = "VeryLazy", + version = false, -- Set this to "*" to always pull the latest release version, or set it to false to update to the latest code changes. + opts = { + }, + -- if you want to build from source then do `make BUILD_FROM_SOURCE=true` + build = "make", + -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows + dependencies = { + "nvim-treesitter/nvim-treesitter", + "stevearc/dressing.nvim", + "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim", + --- The below dependencies are optional, + "echasnovski/mini.pick", -- for file_selector provider mini.pick + "nvim-telescope/telescope.nvim", -- for file_selector provider telescope + "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions + "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons + { + -- support for image pasting + "HakonHarnes/img-clip.nvim", + event = "VeryLazy", + opts = { + -- recommended settings + default = { + embed_image_as_base64 = false, + prompt_for_file_name = false, + drag_and_drop = { + insert_mode = true, + }, + -- required for Windows users + use_absolute_path = true, + }, + }, + }, + { + -- Make sure to set this up properly if you have lazy=true + 'MeanderingProgrammer/render-markdown.nvim', + opts = { + file_types = { "markdown", "Avante" }, + }, + ft = { "markdown", "Avante" }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua new file mode 100644 index 0000000..2675146 --- /dev/null +++ b/.config/nvim/lua/plugins/blink.lua @@ -0,0 +1,38 @@ +return { + 'saghen/blink.cmp', + enabled = false, + dependencies = { + 'rafamadriz/friendly-snippets', + 'mikavilpas/blink-ripgrep.nvim', + }, + + version = '*', + opts = { + appearance = { + use_nvim_cmp_as_default = true, + nerd_font_variant = 'mono' + }, + + sources = { + default = { + 'lsp', + 'path', + 'snippets', + 'buffer', + }, + + }, + completion = { + menu = { + winblend = vim.o.pumblend, + }, + }, + signature = { + enabled = true, + window = { + winblend = vim.o.pumblend, + }, + }, + }, + opts_extend = { "sources.default" } +} diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index 63836d4..a052d34 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -1,37 +1,112 @@ return { - 'saghen/blink.cmp', + 'hrsh7th/nvim-cmp', + event = 'InsertEnter', dependencies = { - 'rafamadriz/friendly-snippets', - 'mikavilpas/blink-ripgrep.nvim', - }, - - version = '*', - opts = { - appearance = { - use_nvim_cmp_as_default = true, - nerd_font_variant = 'mono' + -- Snippet Engine & its associated nvim-cmp source + { + 'L3MON4D3/LuaSnip', + build = (function() + -- Build Step is needed for regex support in snippets. + -- This step is not supported in many windows environments. + -- Remove the below condition to re-enable on windows. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + return + end + return 'make install_jsregexp' + end)(), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, }, + 'saadparwaiz1/cmp_luasnip', + + -- Adds other completion capabilities. + -- nvim-cmp does not ship with all sources by default. They are split + -- into multiple repos for maintenance purposes. + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-path', + 'hrsh7th/cmp-nvim-lsp-signature-help', + }, + config = function() + -- See `:help cmp` + local cmp = require 'cmp' + local luasnip = require 'luasnip' + luasnip.config.setup {} - sources = { - default = { - 'lsp', - 'path', - 'snippets', - 'buffer', + cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, }, + completion = { completeopt = 'menu,menuone,noinsert' }, - }, - completion = { - menu = { - winblend = vim.o.pumblend, + -- For an understanding of why these mappings were + -- chosen, you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + mapping = cmp.mapping.preset.insert { + -- Select the [n]ext item + [''] = cmp.mapping.select_next_item(), + -- Select the [p]revious item + [''] = cmp.mapping.select_prev_item(), + + -- Scroll the documentation window [b]ack / [f]orward + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + + -- Accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + [''] = cmp.mapping.confirm { select = true }, + + -- If you prefer more traditional completion keymaps, + -- you can uncomment the following lines + --[''] = cmp.mapping.confirm { select = true }, + --[''] = cmp.mapping.select_next_item(), + --[''] = cmp.mapping.select_prev_item(), + + -- Manually trigger a completion from nvim-cmp. + -- Generally you don't need this, because nvim-cmp will display + -- completions whenever it has completion options available. + [''] = cmp.mapping.complete {}, + + -- Think of as moving to the right of your snippet expansion. + -- So if you have a snippet that's like: + -- function $name($args) + -- $body + -- end + -- + -- will move you to the right of each of the expansion locations. + -- is similar, except moving you backwards. + [''] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { 'i', 's' }), + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps }, - }, - signature = { - enabled = true, - window = { - winblend = vim.o.pumblend, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + { name = 'nvim_lsp_signature_help' }, }, - }, - }, - opts_extend = { "sources.default" } + } + end, } diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index fe89248..6b05e18 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -80,8 +80,9 @@ return { local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = vim.tbl_deep_extend( "force", - require('blink.cmp').get_lsp_capabilities(), - capabilities + capabilities, + -- require('blink.cmp').get_lsp_capabilities(), + require('cmp_nvim_lsp').default_capabilities() ) local base_path = "" @@ -119,7 +120,7 @@ return { local function organize_imports() local params = { command = "_typescript.organizeImports", - arguments = {vim.api.nvim_buf_get_name(0)}, + arguments = { vim.api.nvim_buf_get_name(0) }, title = "" } vim.lsp.buf.execute_command(params) diff --git a/.config/nvim/lua/plugins/neotest.lua b/.config/nvim/lua/plugins/neotest.lua index 4684044..ccc0612 100644 --- a/.config/nvim/lua/plugins/neotest.lua +++ b/.config/nvim/lua/plugins/neotest.lua @@ -9,6 +9,7 @@ return { -- Adapters "tovijaeschke/neotest-phpunit", "nvim-neotest/neotest-go", + 'nvim-neotest/neotest-jest', }, config = function() local neotest = require("neotest") @@ -71,7 +72,14 @@ return { test_table = true, }, args = { "-count=1", "-timeout=60s" }, - }) + }), + require('neotest-jest')({ + jestCommand = "npm test --", + env = { CI = true }, + cwd = function(path) + return vim.fn.getcwd() + end, + }), }, }) end, diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index f65bb51..4a02d94 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -117,6 +117,10 @@ if [ -f "$HOME/.cargo/env" ]; then . "$HOME/.cargo/env" fi +if [ -f "$HOME/.config/zsh/.api-keys" ]; then + source "$HOME/.config/zsh/.api-keys" +fi + export PATH=~/.config/composer/vendor/bin:$PATH # Speed debugging diff --git a/.gitignore b/.gitignore index 435ee02..68693e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .config/nvim/lazy-lock.json .config/zsh/.zsh_history .config/zsh/.zcompdump +.config/zsh/.api-keys diff --git a/.local/bin/brightness-down b/.local/bin/brightness-down index 69c6714..4af2630 100755 --- a/.local/bin/brightness-down +++ b/.local/bin/brightness-down @@ -4,7 +4,7 @@ set -e # Define the backlight device BACKLIGHT_DEVICE="/sys/class/backlight/intel_backlight" -DECREMENT=5000 # Adjust this to the value you want to increase +DECREMENT=10000 # Adjust this to the value you want to increase # Get the current and max brightness current_brightness=$(cat "$BACKLIGHT_DEVICE/brightness") diff --git a/.local/bin/brightness-up b/.local/bin/brightness-up index 3c0ef9d..1caf3bf 100755 --- a/.local/bin/brightness-up +++ b/.local/bin/brightness-up @@ -4,7 +4,7 @@ set -e # Define the backlight device BACKLIGHT_DEVICE="/sys/class/backlight/intel_backlight" -INCREMENT=5000 # Adjust this to the value you want to increase +INCREMENT=10000 # Adjust this to the value you want to increase # Get the current and max brightness current_brightness=$(cat "$BACKLIGHT_DEVICE/brightness")