From a7f28e9984d5ffe16d876864919ea900ed79d58b Mon Sep 17 00:00:00 2001 From: VersusTuneZ Date: Mon, 5 Jan 2026 22:03:03 +0100 Subject: [PATCH] chore: themes and fixes --- .gitignore | 0 .neoconf.json | 0 lazy-lock.json | 5 +- lua/config/keymaps.lua | 1 - lua/config/options.lua | 1 + lua/lsp/clangd.lua | 2 +- lua/plugins/blink-cmp.lua | 31 ------------ lua/plugins/oil.lua | 8 --- lua/plugins/showkeys.lua | 12 ----- lua/plugins/themes.lua | 69 ++++++++++++-------------- lua/plugins/treesitter-textobjects.lua | 1 + lua/plugins/treesitter.lua | 1 + readme.md | 20 -------- 13 files changed, 37 insertions(+), 114 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 .neoconf.json delete mode 100644 lua/plugins/oil.lua delete mode 100644 lua/plugins/showkeys.lua diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/.neoconf.json b/.neoconf.json old mode 100755 new mode 100644 diff --git a/lazy-lock.json b/lazy-lock.json index d574d06..d08bf4a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,10 +2,10 @@ "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, "calcium.nvim": { "branch": "main", "commit": "7a7d3740083fa5669e1a0f25d133705624a23f0d" }, "conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" }, + "cyberdream.nvim": { "branch": "main", "commit": "a956559cda735fbc9f0b39541529386322afaedd" }, "fidget.nvim": { "branch": "main", "commit": "64463022a1f2ff1318ab22a2ea4125ed9313a483" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "fzf-lua": { "branch": "main", "commit": "a03d68e40eea835a1cdbd9f93049708dab3621e6" }, - "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" }, @@ -23,8 +23,7 @@ "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" }, - "oil.nvim": { "branch": "master", "commit": "81b8a91735ad5cd24a6b3137f14a89f19176364f" }, - "showkeys": { "branch": "main", "commit": "cb0a50296f11f1e585acffba8c253b9e8afc1f84" }, + "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index e335bc2..142cebf 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -1,4 +1,3 @@ -vim.keymap.set("n", "-", "Oil --float", { desc = "Open parent directory" }) vim.keymap.set("n", "gl", function() vim.diagnostic.open_float() end, { desc = "Open Diagnostics in Float" }) diff --git a/lua/config/options.lua b/lua/config/options.lua index b99e847..e6b27d0 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -40,3 +40,4 @@ vim.opt.scrolloff = 5 vim.opt.cmdheight = 0 vim.opt.clipboard = "unnamedplus" + diff --git a/lua/lsp/clangd.lua b/lua/lsp/clangd.lua index 8dece10..b994eb2 100644 --- a/lua/lsp/clangd.lua +++ b/lua/lsp/clangd.lua @@ -1,6 +1,6 @@ return { cmd = { - "clangd", + "/usr/sbin/clangd", "-experimental-modules-support", }, } diff --git a/lua/plugins/blink-cmp.lua b/lua/plugins/blink-cmp.lua index 09d992d..33ab086 100644 --- a/lua/plugins/blink-cmp.lua +++ b/lua/plugins/blink-cmp.lua @@ -1,52 +1,21 @@ return { "saghen/blink.cmp", - -- optional: provides snippets for the snippet source dependencies = { "rafamadriz/friendly-snippets" }, - -- use a release tag to download pre-built binaries version = "1.*", - -- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust - -- build = 'cargo build --release', - -- If you use nix, you can build from source using latest nightly rust with: - -- build = 'nix run .#build-plugin', - - ---@module 'blink.cmp' - ---@type blink.cmp.Config opts = { - -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept) - -- 'super-tab' for mappings similar to vscode (tab to accept) - -- 'enter' for enter to accept - -- 'none' for no mappings - -- - -- All presets have the following mappings: - -- C-space: Open menu or open docs if already open - -- C-n/C-p or Up/Down: Select next/previous item - -- C-e: Hide menu - -- C-k: Toggle signature help (if signature.enabled = true) - -- - -- See :h blink-cmp-config-keymap for defining your own keymap keymap = { preset = "default" }, appearance = { - -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- Adjusts spacing to ensure icons are aligned nerd_font_variant = "mono", }, - -- (Default) Only show the documentation popup when manually triggered completion = { documentation = { auto_show = false } }, - -- Default list of enabled providers defined so that you can extend it - -- elsewhere in your config, without redefining it, due to `opts_extend` sources = { default = { "lsp", "path", "snippets", "buffer" }, }, - -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance - -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation, - -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"` - -- - -- See the fuzzy documentation for more information fuzzy = { implementation = "prefer_rust_with_warning" }, }, opts_extend = { "sources.default" }, diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua deleted file mode 100644 index bdce6ca..0000000 --- a/lua/plugins/oil.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - 'stevearc/oil.nvim', - ---@module 'oil' - ---@type oil.SetupOpts - opts = {}, - dependencies = { { "echasnovski/mini.icons", opts = {} } }, - lazy = false, -} diff --git a/lua/plugins/showkeys.lua b/lua/plugins/showkeys.lua deleted file mode 100644 index 45d5efb..0000000 --- a/lua/plugins/showkeys.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "nvzone/showkeys", - cmd = "ShowkeysToggle", - opts = { - timeout = 1, - maxkeys = 3, - winopts = { - height = 1 - }, - excluded_modes = { "i" } - } -} diff --git a/lua/plugins/themes.lua b/lua/plugins/themes.lua index 5534cda..2da308e 100644 --- a/lua/plugins/themes.lua +++ b/lua/plugins/themes.lua @@ -1,42 +1,35 @@ return { - "rebelot/kanagawa.nvim", - config = function() - require("kanagawa").setup({ - compile = true, - transparent = true, - colors = { - theme = { - all = { - ui = { - bg_gutter = "none", - float = { - bg = "none", - }, - }, - }, + { + "scottmckendry/cyberdream.nvim", + lazy = false, + priority = 1000, + config = function() + require("cyberdream").setup({ + transparent = true, + borderless_pickers = false, + terminal_colors = true + }) + --vim.cmd("colorscheme cyberdream") + end, + }, + { + "rose-pine/neovim", + name = "rose-pine", + config = function() + require("rose-pine").setup({ + extend_background_behind_borders = false, + enable = { + terminal = true, + legacy_highlights = true, -- Improve compatibility for previous versions of Neovim + migrations = true, -- Handle deprecated options automatically }, - }, - overrides = function(colors) - local theme = colors.theme - return { - ["@markup.link.url.markdown_inline"] = { link = "Special" }, -- (url) - ["@markup.link.label.markdown_inline"] = { link = "WarningMsg" }, -- [label] - ["@markup.italic.markdown_inline"] = { link = "Exception" }, -- *italic* - ["@markup.raw.markdown_inline"] = { link = "String" }, -- `code` - ["@markup.list.markdown"] = { link = "Function" }, -- + list - ["@markup.quote.markdown"] = { link = "Error" }, -- > blockcode - ["@markup.list.checked.markdown_inline"] = { link = "Error" }, -- - [X] checked list item - NormalFloat = { bg = "none" }, - FloatBorder = { bg = "none" }, - FloatTitle = { bg = "none" }, - LazyNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, - MasonNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, + styles = { + bold = true, + italic = true, + transparency = true, } - end, - }) - vim.cmd("colorscheme kanagawa") - end, - build = function() - vim.cmd("KanagawaCompile") - end, + }) + vim.cmd("colorscheme rose-pine-main") + end + } } diff --git a/lua/plugins/treesitter-textobjects.lua b/lua/plugins/treesitter-textobjects.lua index e6fb5be..67d9eb1 100644 --- a/lua/plugins/treesitter-textobjects.lua +++ b/lua/plugins/treesitter-textobjects.lua @@ -1,5 +1,6 @@ return { "nvim-treesitter/nvim-treesitter-textobjects", + branch = "master", dependencies = { "nvim-treesitter/nvim-treesitter" }, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index b67eead..a2f5b46 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -2,6 +2,7 @@ return { "nvim-treesitter/nvim-treesitter", lazy = false, build = ":TSUpdate", + branch = "master", config = function() local configs = require("nvim-treesitter.configs") diff --git a/readme.md b/readme.md index a1543e6..f5ea513 100644 --- a/readme.md +++ b/readme.md @@ -3,23 +3,3 @@ ## Dependencies fzf - - -## Plugins - -- [ ] lazy.nvim -- [x] kanagawa.nvim -- [x] mini.statusline -- [x] oil.nvim -- [x] vim-sleuth -- [x] showkeys -- [x] treesitter - -## Keymaps - -### Normal -- `-` open OIL floating - - -## Commands -- ShowkeysToggle