This commit is contained in:
2024-12-17 20:15:12 -05:00
parent a6de4ce60e
commit 49874ff4dc
6 changed files with 18 additions and 20 deletions

View File

@@ -1,18 +1,21 @@
{ {
"LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
"aquarium-vim": { "branch": "develop", "commit": "6da0091836f36f82af558f0395ea50fd5a297d6d" }, "aquarium-vim": { "branch": "develop", "commit": "6da0091836f36f82af558f0395ea50fd5a297d6d" },
"bluloco.nvim": { "branch": "main", "commit": "e3ce113d8bdc9372abcda1d317fbab41809e6a53" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" }, "conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" },
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" }, "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" }, "gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" },
"harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" },

View File

@@ -2,7 +2,9 @@ return {
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
requires = { "kyazdani42/nvim-web-devicons" }, requires = { "kyazdani42/nvim-web-devicons" },
dependencies = { dependencies = {
"stevearc/dressing.nvim",
"norcalli/nvim-colorizer.lua", "norcalli/nvim-colorizer.lua",
"rktjmp/lush.nvim",
"zaldih/themery.nvim", "zaldih/themery.nvim",
"FrenzyExists/aquarium-vim", "FrenzyExists/aquarium-vim",
"vague2k/vague.nvim", "vague2k/vague.nvim",
@@ -11,6 +13,7 @@ return {
"shaunsingh/nord.nvim", "shaunsingh/nord.nvim",
"rose-pine/neovim", "rose-pine/neovim",
"folke/tokyonight.nvim", "folke/tokyonight.nvim",
"uloco/bluloco.nvim"
}, },
config = function() config = function()
require("lualine").setup({ require("lualine").setup({
@@ -36,6 +39,11 @@ return {
"*", "*",
css = { rgb_fn = true }, css = { rgb_fn = true },
}) })
require("dressing").setup({
select = {
backend = { "nui", "telescope", "builtin" }
}
})
require("themery").setup({ require("themery").setup({
themes = { themes = {
"aquarium", "aquarium",
@@ -47,6 +55,7 @@ return {
"nord", "nord",
"rose-pine", "rose-pine",
"tokyonight", "tokyonight",
"bluloco-dark",
}, },
livePreview = true, livePreview = true,
}) })

View File

@@ -1,8 +1,8 @@
return { return {
"stevearc/conform.nvim", "stevearc/conform.nvim",
dependencies = { dependencies = {
"tpope/vim-sleuth" "tpope/vim-sleuth",
}, },
event = { "BufWritePre" }, event = { "BufWritePre" },
cmd = { "ConformInfo" }, cmd = { "ConformInfo" },
keys = { keys = {

View File

@@ -8,6 +8,9 @@ vim.keymap.set("n", "<leader>m", ":make<CR>", { noremap = true, silent = false,
vim.keymap.set("n", "<leader>t", ":below term<CR>i", { noremap = true, silent = true, desc = "Open Terminal Split" }) vim.keymap.set("n", "<leader>t", ":below term<CR>i", { noremap = true, silent = true, desc = "Open Terminal Split" })
vim.keymap.set("t", "<Esc><Esc>", "<C-\\><C-m>", { noremap = true, silent = true, desc = "Go from Terminal mode to Normal mode" }) vim.keymap.set("t", "<Esc><Esc>", "<C-\\><C-m>", { noremap = true, silent = true, desc = "Go from Terminal mode to Normal mode" })
-- LSP
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true, silent = true, desc = "Go to definition" })
-- Disable arrow keys in normal mode -- Disable arrow keys in normal mode
vim.keymap.set("n", "<left>", '<cmd>echo "Use h to move!!"<CR>') vim.keymap.set("n", "<left>", '<cmd>echo "Use h to move!!"<CR>')
vim.keymap.set("n", "<right>", '<cmd>echo "Use l to move!!"<CR>') vim.keymap.set("n", "<right>", '<cmd>echo "Use l to move!!"<CR>')

View File

@@ -32,13 +32,3 @@ vim.opt.colorcolumn = "127"
vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
vim.api.nvim_set_hl(0, 'TabLine', { fg = 'NONE', bg = 'NONE', underline = false })
vim.api.nvim_set_hl(0, 'TabLineSel', { fg = 'NONE', bg = 'NONE', underline = false })
vim.api.nvim_set_hl(0, 'TabLineFill', { fg = 'NONE', bg = 'NONE' })
vim.cmd [[
highlight TabLine guibg=NONE guifg=NONE gui=NONE
highlight TabLineSel guibg=NONE guifg=NONE gui=NONE
highlight TabLineFill guibg=NONE guifg=NONE gui=NONE
]]

View File

@@ -11,13 +11,6 @@ return {
hide_tab_bar_if_only_one_tab = true, -- Hide tab bar if there's only one tab hide_tab_bar_if_only_one_tab = true, -- Hide tab bar if there's only one tab
scrollback_lines = 10000, scrollback_lines = 10000,
window_padding = {
left = 25,
right = 25,
top = 25,
bottom = 25,
},
-- Vague.nvim-inspired theme colors -- Vague.nvim-inspired theme colors
color_scheme = "Vague", -- Assuming you have a color scheme named Vague color_scheme = "Vague", -- Assuming you have a color scheme named Vague
colors = { colors = {