diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 46de80b..3d1b799 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,18 +1,21 @@ { "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "aquarium-vim": { "branch": "develop", "commit": "6da0091836f36f82af558f0395ea50fd5a297d6d" }, + "bluloco.nvim": { "branch": "main", "commit": "e3ce113d8bdc9372abcda1d317fbab41809e6a53" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" }, + "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" }, "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" }, "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua b/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua index 5df663c..d2bd5ef 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua @@ -2,7 +2,9 @@ return { "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons" }, dependencies = { + "stevearc/dressing.nvim", "norcalli/nvim-colorizer.lua", + "rktjmp/lush.nvim", "zaldih/themery.nvim", "FrenzyExists/aquarium-vim", "vague2k/vague.nvim", @@ -11,6 +13,7 @@ return { "shaunsingh/nord.nvim", "rose-pine/neovim", "folke/tokyonight.nvim", + "uloco/bluloco.nvim" }, config = function() require("lualine").setup({ @@ -36,6 +39,11 @@ return { "*", css = { rgb_fn = true }, }) + require("dressing").setup({ + select = { + backend = { "nui", "telescope", "builtin" } + } + }) require("themery").setup({ themes = { "aquarium", @@ -47,6 +55,7 @@ return { "nord", "rose-pine", "tokyonight", + "bluloco-dark", }, livePreview = true, }) diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/format.lua b/nvim/.config/nvim/lua/vxclutch/lazy/format.lua index c602600..d30ede2 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/format.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/format.lua @@ -1,8 +1,8 @@ return { "stevearc/conform.nvim", - dependencies = { - "tpope/vim-sleuth" - }, + dependencies = { + "tpope/vim-sleuth", + }, event = { "BufWritePre" }, cmd = { "ConformInfo" }, keys = { diff --git a/nvim/.config/nvim/lua/vxclutch/remap.lua b/nvim/.config/nvim/lua/vxclutch/remap.lua index b101788..75ef6bd 100644 --- a/nvim/.config/nvim/lua/vxclutch/remap.lua +++ b/nvim/.config/nvim/lua/vxclutch/remap.lua @@ -8,6 +8,9 @@ vim.keymap.set("n", "m", ":make", { noremap = true, silent = false, vim.keymap.set("n", "t", ":below termi", { noremap = true, silent = true, desc = "Open Terminal Split" }) vim.keymap.set("t", "", "", { 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 vim.keymap.set("n", "", 'echo "Use h to move!!"') vim.keymap.set("n", "", 'echo "Use l to move!!"') diff --git a/nvim/.config/nvim/lua/vxclutch/set.lua b/nvim/.config/nvim/lua/vxclutch/set.lua index 03f31cb..09f7440 100644 --- a/nvim/.config/nvim/lua/vxclutch/set.lua +++ b/nvim/.config/nvim/lua/vxclutch/set.lua @@ -32,13 +32,3 @@ vim.opt.colorcolumn = "127" vim.api.nvim_set_hl(0, "Normal", { 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 -]] - diff --git a/wezterm/.wezterm.lua b/wezterm/.wezterm.lua index 17801ec..0d0be18 100644 --- a/wezterm/.wezterm.lua +++ b/wezterm/.wezterm.lua @@ -11,13 +11,6 @@ return { hide_tab_bar_if_only_one_tab = true, -- Hide tab bar if there's only one tab scrollback_lines = 10000, - window_padding = { - left = 25, - right = 25, - top = 25, - bottom = 25, - }, - -- Vague.nvim-inspired theme colors color_scheme = "Vague", -- Assuming you have a color scheme named Vague colors = {