From f48824ac56ad452b1aa04883c1f28ebeea429706 Mon Sep 17 00:00:00 2001 From: ArgentumCation Date: Fri, 20 Dec 2024 19:56:21 -0500 Subject: [PATCH] atempt to recrrste reppo --- init.lua | 2 +- lua/chadrc.lua | 18 +++++++++--------- lua/configs/lspconfig.lua | 2 +- lua/mappings.lua | 13 ++++++++----- lua/plugins.lua | 30 ++++++++++++------------------ 5 files changed, 31 insertions(+), 34 deletions(-) diff --git a/init.lua b/init.lua index f3a38f9..318454b 100644 --- a/init.lua +++ b/init.lua @@ -70,7 +70,7 @@ vim.o.foldcolumn = "0" -- '0' is not bad vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value vim.o.foldlevelstart = 99 -- vim.o.foldenable = true -vim.opt.wildmode = { "list:longest", "lastused" } +vim.opt.wildmode = { "list:longest", "list:full" } vim.opt.wildmenu = true vim.opt.autoread = true vim.o.clipboard = "unnamed,unnamedplus" diff --git a/lua/chadrc.lua b/lua/chadrc.lua index 4924dd1..a88afca 100644 --- a/lua/chadrc.lua +++ b/lua/chadrc.lua @@ -3,8 +3,8 @@ local M = {} -- Path to overriding theme and highlights files local highlights = require "highlights" +M.base46 = { theme = "lunar_witch" } M.ui = { - theme = "lunar_witch", hl_override = highlights.override, hl_add = highlights.add, @@ -16,14 +16,14 @@ M.ui = { return "%#St_pos_sep#" .. "" .. "%#St_pos_icon# %#St_pos_text# [%l,%c]" end, grapple = "%#St_cwd_sep#" - .. " " - .. "%#St_cwd_icon#" - .. "󰛢 " - .. "%#St_cwd_text#" - .. require("grapple").statusline { - include_icon = false, - inactive = " %s", - }, + .. " " + .. "%#St_cwd_icon#" + .. "󰛢 " + .. "%#St_cwd_text#" + .. require("grapple").statusline { + include_icon = false, + inactive = " %s", + }, }, }, } diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua index eba5d9f..451ca8f 100644 --- a/lua/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -12,7 +12,6 @@ require("mason-lspconfig").setup_handlers { local servers = { "html", "cssls", - "ts_ls", "clangd", "gopls", "astro", @@ -24,6 +23,7 @@ local servers = { "css_variables", "marksman", -- "rust_analyzer", + "rust_analyzer", "ruff", "jdtls", "nil_ls", diff --git a/lua/mappings.lua b/lua/mappings.lua index caa7c38..78a6e88 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -4,10 +4,14 @@ local M = {} M.General = function() map("n", ";", ":", { desc = "general enter command mode", nowait = true }) map("v", ">", ">gv", { desc = "general indent" }) - map("n", "", "h", { desc = "switch Window left" }) - map("n", "", "l", { desc = "switch Window right" }) - map("n", "", "j", { desc = "switch Window down" }) - map("n", "", "k", { desc = "switch Window up" }) + -- map("n", "", "h", { desc = "switch Window left" }) + -- map("n", "", "l", { desc = "switch Window right" }) + -- map("n", "", "j", { desc = "switch Window down" }) + -- map("n", "", "k", { desc = "switch Window up" }) + map("n", "", "TmuxNavigateLeft", { desc = "switch Window left" }) + map("n", "", "TmuxNavigateRight", { desc = "switch Window right" }) + map("n", "", "TmuxNavigateDown ", { desc = "switch Window down" }) + map("n", "", "TmuxNavigateUp", { desc = "switch Window up" }) map("n", "K", "Lspsaga hover_doc", { desc = "LSPSaga Hover" }) map("n", "]d", function() vim.diagnostic.goto_next() @@ -146,5 +150,4 @@ end M.Trouble = function() map("n", "dx", "Trouble diagnostics toggle", { desc = "Trouble Diagnostics" }) end - return M diff --git a/lua/plugins.lua b/lua/plugins.lua index b3b0930..7ff0e82 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -15,6 +15,7 @@ return { PATH = "append", }, }, + { "cbochs/grapple.nvim", dependencies = { @@ -29,7 +30,7 @@ return { end, dependencies = { "nvim-treesitter/nvim-treesitter", -- optional - "nvim-tree/nvim-web-devicons", -- optional + "nvim-tree/nvim-web-devicons", -- optional }, }, { "ThePrimeagen/refactoring.nvim" }, @@ -80,7 +81,7 @@ return { }, -- Delimiters - { "Raimondi/delimitMate", lazy = false }, + { "Raimondi/delimitMate", lazy = false }, -- lazygit { "kdheepak/lazygit.nvim", @@ -90,7 +91,7 @@ return { lazy = false, }, -- fzf - { "junegunn/fzf.vim", lazy = false }, + { "junegunn/fzf.vim", lazy = false }, { "nvim-telescope/telescope.nvim", config = function() @@ -210,21 +211,7 @@ return { { "mrcjkb/rustaceanvim", version = "^5", -- Recommended - lazy = false, -- This plugin is already lazy - ["rust-analyzer"] = { - cargo = { - all_features = true, - }, - }, - }, - { - "saecki/crates.nvim", - ft = { "rust", "toml" }, - config = function(_, opts) - local crates = require "crates" - crates.setup(opts) - crates.show() - end, + lazy = false, -- This plugin is already lazy }, ----------- -- swkhd -- @@ -277,6 +264,13 @@ return { mappings.Dap_go() end, }, + ------------ + -- tmux -- + ------------ + { + "christoomey/vim-tmux-navigator", + lazy = false, + }, -- All NvChad plugins are lazy-loaded by default -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false` -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example