atempt to recrrste reppo

This commit is contained in:
ArgentumCation 2024-12-20 19:56:21 -05:00
parent 8d54dcbc14
commit f48824ac56
5 changed files with 31 additions and 34 deletions

View file

@ -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"

View file

@ -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",
},
},
},
}

View file

@ -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",

View file

@ -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", "<C-Left>", "<C-w>h", { desc = "switch Window left" })
map("n", "<C-Right>", "<C-w>l", { desc = "switch Window right" })
map("n", "<C-Down>", "<C-w>j", { desc = "switch Window down" })
map("n", "<C-Up>", "<C-w>k", { desc = "switch Window up" })
-- map("n", "<C-Left>", "<C-w>h", { desc = "switch Window left" })
-- map("n", "<C-Right>", "<C-w>l", { desc = "switch Window right" })
-- map("n", "<C-Down>", "<C-w>j", { desc = "switch Window down" })
-- map("n", "<C-Up>", "<C-w>k", { desc = "switch Window up" })
map("n", "<C-Left>", "<cmd>TmuxNavigateLeft<CR>", { desc = "switch Window left" })
map("n", "<C-Right>", "<cmd>TmuxNavigateRight<CR>", { desc = "switch Window right" })
map("n", "<C-Down>", "<cmd>TmuxNavigateDown<CR> ", { desc = "switch Window down" })
map("n", "<C-Up>", "<cmd>TmuxNavigateUp<CR>", { desc = "switch Window up" })
map("n", "K", "<cmd>Lspsaga hover_doc<CR>", { desc = "LSPSaga Hover" })
map("n", "]d", function()
vim.diagnostic.goto_next()
@ -146,5 +150,4 @@ end
M.Trouble = function()
map("n", "<leader>dx", "<cmd>Trouble diagnostics toggle<cr>", { desc = "Trouble Diagnostics" })
end
return M

View file

@ -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