From 9ed8c5e278da56698662537a7d9d1f504c22e759 Mon Sep 17 00:00:00 2001 From: Dane Sabo Date: Thu, 13 Mar 2025 17:31:30 -0400 Subject: [PATCH] changed some bindings --- lazy-lock.json | 20 +++++------ lua/core/mappings.lua | 15 -------- lua/custom/chadrc.lua | 2 +- lua/custom/configs/lspconfig.lua | 62 ++++++++++++++++---------------- 4 files changed, 42 insertions(+), 57 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index d27b762..020f1c3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,26 +10,26 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" }, - "crates.nvim": { "branch": "main", "commit": "6bf1b4ceb62f205c903590ccc62061aafc17024a" }, + "crates.nvim": { "branch": "main", "commit": "1803c8b5516610ba7cdb759a4472a78414ee6cd4" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" }, "indent-blankline.nvim": { "branch": "master", "commit": "b7aa0aed55887edfaece23f7b46ab22232fc8741" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazy.nvim": { "branch": "main", "commit": "a8c6db5da7bd382094606340eed015d14fbb5654" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, - "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, - "nvim-dap": { "branch": "master", "commit": "8228cb00ab0850e483f8d58cc39cc580c05738d6" }, + "nvim-cmp": { "branch": "main", "commit": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "943be69156b94fbc96064f4913d653f0c7fb299f" }, + "nvim-dap": { "branch": "master", "commit": "6e0e8ab4d8ed520076971465a4388dfe54a91d83" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, - "nvim-lspconfig": { "branch": "master", "commit": "84e0cd5a3c58e88ef706fdf4a1eed59ded1d3ce2" }, - "nvim-tree.lua": { "branch": "master", "commit": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4" }, - "nvim-treesitter": { "branch": "master", "commit": "2b0760dca2354fecf48ea35fdf1d753a232e3de2" }, - "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, + "nvim-lspconfig": { "branch": "master", "commit": "9e932edb0af4e20880685ddb96a231669fbe8091" }, + "nvim-tree.lua": { "branch": "master", "commit": "6709463b2d18e77f7a946027917aa00d4aaed6f4" }, + "nvim-treesitter": { "branch": "master", "commit": "e6d02ec9efd396d294a7793f2066e2527b07b03a" }, + "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" }, "nvterm": { "branch": "main", "commit": "9d7ba3b6e368243175d38e1ec956e0476fd86ed9" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, - "telescope.nvim": { "branch": "master", "commit": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4" }, + "telescope.nvim": { "branch": "master", "commit": "589910694bafe3975d0f025a750dcabc09824126" }, "tla.nvim": { "branch": "master", "commit": "1db3e7558066b89c391d20dbc99972023a176491" }, "ui": { "branch": "v2.0", "commit": "7b3225264af17a9e0aff0b4fd2a0fac90b73db53" }, "vim-tla": { "branch": "master", "commit": "220145ef791ac8d64d2c319eb2940b59da17d6ca" }, diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index 0fd3e6d..7c541f0 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -341,21 +341,6 @@ M.nvterm = { end, "Toggle vertical term", }, - - -- new - ["h"] = { - function() - require("nvterm.terminal").new "horizontal" - end, - "New horizontal term", - }, - - ["v"] = { - function() - require("nvterm.terminal").new "vertical" - end, - "New vertical term", - }, }, } diff --git a/lua/custom/chadrc.lua b/lua/custom/chadrc.lua index 7031f55..bbef848 100644 --- a/lua/custom/chadrc.lua +++ b/lua/custom/chadrc.lua @@ -1,7 +1,7 @@ ---@type ChadrcConfig local M = {} -M.ui = { theme = 'melange' } +M.ui = { theme = 'rxyhn' } M.plugins = 'custom.plugins' M.mappings = require "custom.mappings" return M diff --git a/lua/custom/configs/lspconfig.lua b/lua/custom/configs/lspconfig.lua index 2c97b7a..9e13f98 100644 --- a/lua/custom/configs/lspconfig.lua +++ b/lua/custom/configs/lspconfig.lua @@ -1,36 +1,36 @@ local config = require "plugins.configs.lspconfig" -local on_attach = function(client, bufnr) - config.on_attach(client, bufnr) - - -- Keybinding to show hover documentation - vim.api.nvim_buf_set_keymap( - bufnr, - "n", - "h", - "lua vim.lsp.buf.hover()", - { noremap = true, silent = true } - ) - - -- Keybinding to show diagnostics - vim.api.nvim_buf_set_keymap( - bufnr, - "n", - "e", - 'lua vim.diagnostic.open_float(nil, { focusable = false, close_events = {"BufLeave", "CursorMoved", "InsertEnter", "FocusLost"}, border = "rounded", source = "always", prefix = " ", scope = "cursor" })', - { noremap = true, silent = true } - ) - - -- Keybinding to show signature help - vim.api.nvim_buf_set_keymap( - bufnr, - "n", - "s", - "lua vim.lsp.buf.signature_help()", - { noremap = true, silent = true } - ) -end - +-- local on_attach = function(client, bufnr) +-- config.on_attach(client, bufnr) +-- +-- -- Keybinding to show hover documentation +-- vim.api.nvim_buf_set_keymap( +-- bufnr, +-- "n", +-- "H", +-- "lua vim.lsp.buf.hover()", +-- { noremap = true, silent = true } +-- ) +-- +-- -- Keybinding to show diagnostics +-- vim.api.nvim_buf_set_keymap( +-- bufnr, +-- "n", +-- "E", +-- 'lua vim.diagnostic.open_float(nil, { focusable = false, close_events = {"BufLeave", "CursorMoved", "InsertEnter", "FocusLost"}, border = "rounded", source = "always", prefix = " ", scope = "cursor" })', +-- { noremap = true, silent = true } +-- ) +-- +-- -- Keybinding to show signature help +-- vim.api.nvim_buf_set_keymap( +-- bufnr, +-- "n", +-- "S", +-- "lua vim.lsp.buf.signature_help()", +-- { noremap = true, silent = true } +-- ) +-- end +-- local capabilities = config.capabilities local lspconfig = require "lspconfig"