diff --git a/configs/.p10k.zsh b/configs/.p10k.zsh index f0e294d..5d22ba3 100644 --- a/configs/.p10k.zsh +++ b/configs/.p10k.zsh @@ -80,7 +80,7 @@ # Red prompt symbol if the last command failed. typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS}_FOREGROUND=$red # Default prompt symbol. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='▶' + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='ᐷ' # Prompt symbol in command vi mode. typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮' # Prompt symbol in visual vi mode is the same as in command mode. diff --git a/configs/nvim/ftplugin/symboltree.lua b/configs/nvim/ftplugin/symboltree.lua index 880883a..497c061 100644 --- a/configs/nvim/ftplugin/symboltree.lua +++ b/configs/nvim/ftplugin/symboltree.lua @@ -1,2 +1,2 @@ -vim.api.nvim_set_keymap("n", "I", "zo", { noremap = true, silent = true, buffer = 0 }) -vim.api.nvim_set_keymap("n", "", "zo", { noremap = true, silent = true, buffer = 0 }) +vim.api.nvim_buf_set_keymap(0, "n", "I", "zo", { noremap = true, silent = true }) +vim.api.nvim_buf_set_keymap(0, "n", "", "zo", { noremap = true, silent = true }) diff --git a/configs/nvim/lazy-lock.json b/configs/nvim/lazy-lock.json index b84cf5d..899e62a 100644 --- a/configs/nvim/lazy-lock.json +++ b/configs/nvim/lazy-lock.json @@ -9,9 +9,10 @@ "catppuccin": { "branch": "main", "commit": "3020af75aae098a77737d91ee37c7147c8450d99" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" }, - "cmp-nvim-lua": { "branch": "main", "commit": "d276254e7198ab7d00f117e88e223b4bd8c02d21" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "dressing.nvim": { "branch": "master", "commit": "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c" }, "editorconfig-vim": { "branch": "master", "commit": "30ddc057f71287c3ac2beca876e7ae6d5abe26a0" }, "friendly-snippets": { "branch": "main", "commit": "484fb38b8f493ceeebf4e6fc499ebe41e10aae25" }, "fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" }, @@ -35,6 +36,7 @@ "neotest": { "branch": "master", "commit": "414b43f99da0a827c3ce897161fc67c3bb6a5d83" }, "neotest-jest": { "branch": "main", "commit": "8b8926480865e56053681d0c56e3be0a3b5e716c" }, "neotest-vitest": { "branch": "main", "commit": "d6577b191e16c174bffbec1eadfcd65c22fdcc0d" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "8c3c951ab64972821d8338365bce946bc66f4ba5" }, "nui.nvim": { "branch": "main", "commit": "257da38029d3859ed111804f9d4e95b0fa993a31" }, "nvim-cmp": { "branch": "main", "commit": "c49ad26e894e137e401b1d294948c46327877eaf" }, "nvim-dap": { "branch": "master", "commit": "1077a86c83f75a6eec36c91f91d6b728e2b02130" }, diff --git a/configs/nvim/lua/max/core/keymappings.lua b/configs/nvim/lua/max/core/keymappings.lua index 2dd9559..7cf5b8d 100644 --- a/configs/nvim/lua/max/core/keymappings.lua +++ b/configs/nvim/lua/max/core/keymappings.lua @@ -15,6 +15,13 @@ map("n", "", "za", opts) map("v", ">", ">gv", opts) map("v", "<", "n", ":lua vim.diagnostic.goto_next()", opts) map("n", "p", ":lua vim.diagnostic.goto_prev()", opts) @@ -23,7 +30,6 @@ map("n", "gd", "lua vim.lsp.buf.definition()", opts) map("n", "gi", "lua vim.lsp.buf.implementation()", opts) map("n", "K", "Lspsaga hover_doc", { silent = true }) -map("n", "e", "lua vim.lsp.buf.hover()", { silent = true }) map("n", "rn", "lua vim.lsp.buf.rename()", opts) map({ "n", "v" }, "c", "Lspsaga code_action", { silent = true }) map({ "n", "v" }, "gr", "Lspsaga lsp_finder", opts) @@ -64,8 +70,8 @@ map("n", "", ":bnext", opts) -- Copy visual selection to keyboard map("v", "Y", '"+y', opts) -map("n", "k", "{", opts) -map("n", "j", "}", opts) +map("n", "", "{", opts) +map("n", "", "}", opts) -- Move lines vscode style map("n", "", "move +1", opts) diff --git a/configs/nvim/lua/max/core/plugins.lua b/configs/nvim/lua/max/core/plugins.lua index ca9cf69..5651a80 100644 --- a/configs/nvim/lua/max/core/plugins.lua +++ b/configs/nvim/lua/max/core/plugins.lua @@ -2,6 +2,8 @@ local plugins = { "nvim-lua/plenary.nvim", + + --------------------- -- Theming Section -- --------------------- @@ -19,7 +21,11 @@ local plugins = { -------------------- -- Layout Plugins -- -------------------- - + { "shortcuts/no-neck-pain.nvim", cmd = "NoNeckPain", config = true }, + { + "stevearc/dressing.nvim", + config = true + }, { "folke/which-key.nvim", event = "VimEnter", @@ -29,7 +35,7 @@ local plugins = { }, { "ldelossa/litee.nvim", - command = "InsertEnter", + cmd = "InsertEnter", dependencies = { "ldelossa/litee-symboltree.nvim", "ldelossa/litee-calltree.nvim", @@ -48,6 +54,7 @@ local plugins = { }, { "lewis6991/gitsigns.nvim", + lazy = false, config = function() require("gitsigns").setup() end, @@ -114,7 +121,7 @@ local plugins = { --------------- { "glepnir/lspsaga.nvim", - command = "Lspsaga" + cmd = "Lspsaga" }, -- better windows for lsp replace, goto definition etc... { "VonHeikemen/lsp-zero.nvim", dependencies = { @@ -147,7 +154,7 @@ local plugins = { end }, { "folke/trouble.nvim", - command = "TroubleToggle", + cmd = "TroubleToggle", dependencies = "kyazdani42/nvim-web-devicons", config = function() require("trouble").setup({}) @@ -161,7 +168,7 @@ local plugins = { ------------------- -- Autocomplete -- ------------------- - { "tpope/vim-surround", event = "InsertEnter" }, + { "tpope/vim-surround", lazy = false }, { "nat-418/boole.nvim", event = "BufReadPre", @@ -195,7 +202,7 @@ local plugins = { -------------------- { "jackMort/ChatGPT.nvim", - command = "ChatGPT", + cmd = "ChatGPT", config = true, dependencies = { "MunifTanjim/nui.nvim", @@ -222,7 +229,7 @@ local plugins = { "editorconfig/editorconfig-vim", { "michaelb/sniprun", - command = "SnipRun", + event = "BufRead", config = function() require("max.configs.sniprun") end,