From 618bf42ab587df1920442e593faf7234e8d39c2d Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Fri, 13 Mar 2026 22:23:43 +0000 Subject: [PATCH 01/17] updte and added some plugins fav is Harpoon :) --- .gitignore | 1 - init.lua | 190 ++++++++++++-------------------- lazy-lock.json | 27 +++++ lua/custom/plugins/fugitive.lua | 4 + lua/custom/plugins/hardtime.lua | 18 +++ lua/custom/plugins/harpoon.lua | 19 ++++ lua/custom/plugins/undotree.lua | 9 ++ 7 files changed, 148 insertions(+), 120 deletions(-) create mode 100644 lazy-lock.json create mode 100644 lua/custom/plugins/fugitive.lua create mode 100644 lua/custom/plugins/hardtime.lua create mode 100644 lua/custom/plugins/harpoon.lua create mode 100644 lua/custom/plugins/undotree.lua diff --git a/.gitignore b/.gitignore index 3bec00f5d40..961e88ca0d0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,5 @@ spell/ # You likely want to comment this, since it's recommended to track lazy-lock.json in version # control, see https://lazy.folke.io/usage/lockfile # For kickstart, it makes sense to leave it ignored. -lazy-lock.json .DS_Store diff --git a/init.lua b/init.lua index ed50b69d7f3..46ddc244760 100644 --- a/init.lua +++ b/init.lua @@ -1,97 +1,14 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== -======== .-----. ======== -======== .----------------------. | === | ======== -======== |.-""""""""""""""""""-.| |-----| ======== -======== || || | === | ======== -======== || KICKSTART.NVIM || |-----| ======== -======== || || | === | ======== -======== || || |-----| ======== -======== ||:Tutor || |:::::| ======== -======== |'-..................-'| |____o| ======== -======== `"")----------------(""` ___________ ======== -======== /::::::::::| |::::::::::\ \ no mouse \ ======== -======== /:::========| |==hjkl==:::\ \ required \ ======== -======== '""""""""""""' '""""""""""""' '""""""""""' ======== -======== ======== -===================================================================== -===================================================================== - -What is Kickstart? - - Kickstart.nvim is *not* a distribution. - - Kickstart.nvim is a starting point for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you can start exploring, configuring and tinkering to - make Neovim your own! That might mean leaving Kickstart just the way it is for a while - or immediately breaking it into modular pieces. It's up to you! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example which will only take 10-15 minutes: - - https://learnxinyminutes.com/docs/lua/ - - After understanding a bit more about Lua, you can use `:help lua-guide` as a - reference for how Neovim integrates Lua. - - :help lua-guide - - (or HTML version): https://neovim.io/doc/user/lua-guide.html - -Kickstart Guide: - - TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. - - If you don't know what this means, type the following: - - - - : - - Tutor - - - - (If you already know the Neovim basics, you can skip this step.) - - Once you've completed that, you can continue working through **AND READING** the rest - of the kickstart init.lua. - - Next, run AND READ `:help`. - This will open up a help window with some basic information - about reading, navigating and searching the builtin help documentation. - - This should be the first place you go to look when you're stuck or confused - with something. It's one of my favorite Neovim features. - - MOST IMPORTANTLY, we provide a keymap "sh" to [s]earch the [h]elp documentation, - which is very useful when you're not exactly sure of what you're looking for. - - I have left several `:help X` comments throughout the init.lua - These are hints about where to find more information about the relevant settings, - plugins or Neovim features used in Kickstart. - - NOTE: Look for lines like this - - Throughout the file. These are for you, the reader, to help you understand what is happening. - Feel free to delete them once you know what you're doing, but they should serve as a guide - for when you are first encountering a few different constructs in your Neovim config. - -If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now! :) ---]] +-- Thanks TJ :) -- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' +vim.opt.guicursor = '' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.o` @@ -100,9 +17,7 @@ vim.g.have_nerd_font = false -- Make line numbers default vim.o.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! --- vim.o.relativenumber = true +vim.o.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.o.mouse = 'a' @@ -114,13 +29,35 @@ vim.o.showmode = false -- Schedule the setting after `UiEnter` because it can increase startup-time. -- Remove this option if you want your OS clipboard to remain independent. -- See `:help 'clipboard'` -vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) +-- vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) +vim.keymap.set('n', 'y', '"+y') +vim.keymap.set('v', 'y', '"+y') +vim.keymap.set('n', 'yap', '"+yap') +vim.keymap.set('v', 'yap', '"+yap') +vim.keymap.set('n', 'p', '"+p') + +-- Navigating highlighted text after vap or v-j or k +vim.keymap.set('v', '', ":m '>+1gv=gv") +vim.keymap.set('v', '', ":m '<-2gv=gv") +vim.keymap.set('v', '', 'bd', vim.cmd.bdelete) + +-- go to project view +vim.keymap.set('n', 'pv', vim.cmd.Ex) -- Enable break indent vim.o.breakindent = true +vim.keymap.set('v', '', '>gv') + +-- Enable break indent +-- vim.o.breakindent = true -- Enable undo/redo changes even after closing and reopening a file vim.o.undofile = true +vim.opt.swapfile = false +vim.opt.undodir = os.getenv 'HOME' .. '/.vim/undodir' -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term vim.o.ignorecase = true @@ -129,6 +66,11 @@ vim.o.smartcase = true -- Keep signcolumn on by default vim.o.signcolumn = 'yes' +-- color column +vim.opt.colorcolumn = '100' + +-- most disgusting keymap to quit +vim.keymap.set('n', 'qq', vim.cmd.q) -- Decrease update time vim.o.updatetime = 250 @@ -150,6 +92,11 @@ vim.o.splitbelow = true vim.o.list = true vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.expandtab = false + -- Preview substitutions live, as you type! vim.o.inccommand = 'split' @@ -167,6 +114,9 @@ vim.o.confirm = true -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` +-- making jj to act like Esc +vim.keymap.set('i', 'jj', '') + -- Clear highlights on search when pressing in normal mode -- See `:help hlsearch` vim.keymap.set('n', '', 'nohlsearch') @@ -303,27 +253,28 @@ require('lazy').setup({ -- Then, because we use the `opts` key (recommended), the configuration runs -- after the plugin has been loaded as `require(MODULE).setup(opts)`. - { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', - ---@module 'which-key' - ---@type wk.Opts - ---@diagnostic disable-next-line: missing-fields - opts = { - -- delay between pressing a key and opening which-key (milliseconds) - delay = 0, - icons = { mappings = vim.g.have_nerd_font }, - - -- Document existing key chains - spec = { - { 's', group = '[S]earch', mode = { 'n', 'v' } }, - { 't', group = '[T]oggle' }, - { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first - { 'gr', group = 'LSP Actions', mode = { 'n' } }, - }, - }, - }, - + -- I'd intentionally hide which key... might see its use later + -- { -- Useful plugin to show you pending keybinds. + -- 'folke/which-key.nvim', + -- event = 'VimEnter', + -- ---@module 'which-key' + -- ---@type wk.Opts + -- ---@diagnostic disable-next-line: missing-fields + -- opts = { + -- -- delay between pressing a key and opening which-key (milliseconds) + -- delay = 0, + -- icons = { mappings = vim.g.have_nerd_font }, + -- + -- -- Document existing key chains + -- spec = { + -- { 's', group = '[S]earch', mode = { 'n', 'v' } }, + -- { 't', group = '[T]oggle' }, + -- { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first + -- { 'gr', group = 'LSP Actions', mode = { 'n' } }, + -- }, + -- }, + -- }, + -- -- NOTE: Plugins can specify dependencies. -- -- The dependencies are proper plugin specifications as well - anything @@ -360,7 +311,7 @@ require('lazy').setup({ { 'nvim-telescope/telescope-ui-select.nvim' }, -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + { 'nvim-tree/nvim-web-devicons', disabled = vim.g.have_nerd_font }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that @@ -589,9 +540,9 @@ require('lazy').setup({ -- code, if the language server you are using supports them -- -- This may be unwanted, since they displace some of your code - if client and client:supports_method('textDocument/inlayHint', event.buf) then - map('th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints') - end + -- if client and client:supports_method('textDocument/inlayHint', event.buf) then + -- map('th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints') + -- end end, }) @@ -600,9 +551,9 @@ require('lazy').setup({ -- See `:help lsp-config` for information about keys and how to configure ---@type table local servers = { - -- clangd = {}, + clangd = {}, -- gopls = {}, - -- pyright = {}, + pyright = {}, -- rust_analyzer = {}, -- -- Some languages (like typescript) have entire language plugins that can be useful: @@ -811,6 +762,7 @@ require('lazy').setup({ styles = { comments = { italic = false }, -- Disable italics in comments }, + transparent = true, } -- Load the colorscheme here. @@ -854,7 +806,7 @@ require('lazy').setup({ -- and try some other statusline plugin local statusline = require 'mini.statusline' -- set use_icons to true if you have a Nerd Font - statusline.setup { use_icons = vim.g.have_nerd_font } + statusline.setup { use_icons = false } -- You can configure sections in the statusline by overriding their -- default behavior. For example, here we set the section for @@ -920,7 +872,7 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 00000000000..2cbc48e5870 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,27 @@ +{ + "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, + "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, + "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, + "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, + "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, + "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, + "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" }, + "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mini.nvim": { "branch": "main", "commit": "9990c41f10f54f29a888d13024c9f765037bde23" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lspconfig": { "branch": "master", "commit": "883c6495b53fccbd35d0938aac8bdf72f6d499c0" }, + "nvim-treesitter": { "branch": "main", "commit": "493890b87a81dfe6a7e577dbc364ae33fa482da9" }, + "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, + "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, + "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, + "undotree": { "branch": "main", "commit": "0e6d41d55ad147407e4ba00a292973de8db0b836" }, + "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" } +} diff --git a/lua/custom/plugins/fugitive.lua b/lua/custom/plugins/fugitive.lua new file mode 100644 index 00000000000..4f162827450 --- /dev/null +++ b/lua/custom/plugins/fugitive.lua @@ -0,0 +1,4 @@ +return { + 'tpope/vim-fugitive', + config = function() vim.keymap.set('n', 'gs', vim.cmd.Git, { desc = 'fugitive git status' }) end, +} diff --git a/lua/custom/plugins/hardtime.lua b/lua/custom/plugins/hardtime.lua new file mode 100644 index 00000000000..27ef27456ae --- /dev/null +++ b/lua/custom/plugins/hardtime.lua @@ -0,0 +1,18 @@ +return { + 'm4xshen/hardtime.nvim', + dependencies = { 'MunifTanjim/nui.nvim', 'nvim-lua/plenary.nvim' }, + opts = { + -- Set to false if you want to keep using your mouse while learning + disable_mouse = true, + + -- After 3 repeated presses of a key, it will block you for 1 second + max_time = 1000, + max_count = 3, + + -- This will give you hints like "Use 5j instead of jjjjj" + hint = true, + + -- You can disable it for specific filetypes like the Lazy dashboard + disabled_filetypes = { 'qf', 'netrw', 'NvimTree', 'lazy', 'mason' }, + }, +} diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua new file mode 100644 index 00000000000..445127c1680 --- /dev/null +++ b/lua/custom/plugins/harpoon.lua @@ -0,0 +1,19 @@ +return { + 'ThePrimeagen/harpoon', + -- No branch needed; defaults to master (Harpoon 1) + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local mark = require 'harpoon.mark' + local ui = require 'harpoon.ui' + + -- Keymaps for Harpoon 1 + vim.keymap.set('n', 'h', mark.add_file) + vim.keymap.set('n', 'H', ui.toggle_quick_menu) + + -- Quick Jumps + vim.keymap.set('n', '1', function() ui.nav_file(1) end) + vim.keymap.set('n', '2', function() ui.nav_file(2) end) + vim.keymap.set('n', '3', function() ui.nav_file(3) end) + -- Add more as needed + end, +} diff --git a/lua/custom/plugins/undotree.lua b/lua/custom/plugins/undotree.lua new file mode 100644 index 00000000000..76c162a4bb0 --- /dev/null +++ b/lua/custom/plugins/undotree.lua @@ -0,0 +1,9 @@ +return { + 'jiaoshijie/undotree', + opts = { + -- your options + }, + keys = { -- load the plugin only when using it's keybinding: + { 'u', "lua require('undotree').toggle()" }, + }, +} From b4915bd9f6868ca1d3188c6dc337248adcecadc2 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Sat, 14 Mar 2026 04:25:34 +0000 Subject: [PATCH 02/17] update --- init.lua | 42 +++++++++++++++++++-------------- lazy-lock.json | 1 + lua/custom/plugins/rosepine.lua | 13 ++++++++++ 3 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 lua/custom/plugins/rosepine.lua diff --git a/init.lua b/init.lua index 46ddc244760..34fe0de5af4 100644 --- a/init.lua +++ b/init.lua @@ -15,6 +15,9 @@ vim.g.have_nerd_font = true -- NOTE: You can change these options as you wish! -- For more options, you can see `:help option-list` +-- add the damn sign columns +vim.opt.signcolumn = 'yes' + -- Make line numbers default vim.o.number = true vim.o.relativenumber = true @@ -59,6 +62,9 @@ vim.o.undofile = true vim.opt.swapfile = false vim.opt.undodir = os.getenv 'HOME' .. '/.vim/undodir' +-- close the damn folds +vim.opt.foldenable = false + -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term vim.o.ignorecase = true vim.o.smartcase = true @@ -75,7 +81,7 @@ vim.keymap.set('n', 'qq', vim.cmd.q) vim.o.updatetime = 250 -- Decrease mapped sequence wait time -vim.o.timeoutlen = 300 +vim.o.timeoutlen = 1000 -- Configure how new splits should be opened vim.o.splitright = true @@ -311,7 +317,7 @@ require('lazy').setup({ { 'nvim-telescope/telescope-ui-select.nvim' }, -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', disabled = vim.g.have_nerd_font }, + { 'nvim-tree/nvim-web-devicons', enabled = false }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that @@ -754,22 +760,22 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - config = function() - ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, - transparent = true, - } - - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - end, + -- 'folke/tokyonight.nvim', + -- priority = 1000, -- Make sure to load this before all the other start plugins. + -- config = function() + -- ---@diagnostic disable-next-line: missing-fields + -- require('tokyonight').setup { + -- styles = { + -- comments = { italic = false }, -- Disable italics in comments + -- }, + -- transparent = true, + -- } + -- + -- -- Load the colorscheme here. + -- -- Like many other themes, this one has different styles, and you could load + -- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + -- vim.cmd.colorscheme 'tokyonight-night' + -- end, }, -- Highlight todo, notes, etc in comments diff --git a/lazy-lock.json b/lazy-lock.json index 2cbc48e5870..57a1dcd686c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -17,6 +17,7 @@ "nvim-treesitter": { "branch": "main", "commit": "493890b87a81dfe6a7e577dbc364ae33fa482da9" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, diff --git a/lua/custom/plugins/rosepine.lua b/lua/custom/plugins/rosepine.lua new file mode 100644 index 00000000000..24e7344d9f7 --- /dev/null +++ b/lua/custom/plugins/rosepine.lua @@ -0,0 +1,13 @@ +-- lua/plugins/rose-pine.lua +return { + 'rose-pine/neovim', + name = 'rose-pine', + config = function() + require('rose-pine').setup { + styles = { + transparency = true, + }, + } + vim.cmd 'colorscheme rose-pine-moon' + end, +} From 7341dcc122dc352c056c416d2194b983cd1bea93 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Sat, 14 Mar 2026 11:52:22 +0000 Subject: [PATCH 03/17] update --- init.lua | 11 ++++++++--- lazy-lock.json | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index 34fe0de5af4..c4516e6b534 100644 --- a/init.lua +++ b/init.lua @@ -28,6 +28,11 @@ vim.o.mouse = 'a' -- Don't show the mode, since it's already in the status line vim.o.showmode = false +-- soft and elegant Neotree toggle +vim.keymap.set('n', 'e', 'Neotree toggle') +vim.keymap.set('v', 'e', 'Neotree toggle') +vim.keymap.set('i', 'e', 'Neotree toggle') + -- Sync clipboard between OS and Neovim. -- Schedule the setting after `UiEnter` because it can increase startup-time. -- Remove this option if you want your OS clipboard to remain independent. @@ -869,9 +874,9 @@ require('lazy').setup({ -- -- require 'kickstart.plugins.debug', -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.lint', + require 'kickstart.plugins.autopairs', + require 'kickstart.plugins.neo-tree', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommended keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` diff --git a/lazy-lock.json b/lazy-lock.json index 57a1dcd686c..ce5c1eb86c5 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,7 +12,10 @@ "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "mini.nvim": { "branch": "main", "commit": "9990c41f10f54f29a888d13024c9f765037bde23" }, + "neo-tree.nvim": { "branch": "main", "commit": "ba6871d15528e36657d19a3112cc1697c59da19a" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, + "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, "nvim-lspconfig": { "branch": "master", "commit": "883c6495b53fccbd35d0938aac8bdf72f6d499c0" }, "nvim-treesitter": { "branch": "main", "commit": "493890b87a81dfe6a7e577dbc364ae33fa482da9" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, @@ -22,7 +25,6 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, - "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "undotree": { "branch": "main", "commit": "0e6d41d55ad147407e4ba00a292973de8db0b836" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" } } From 05569c500f2e74390df3183d037eaba88fa0cf33 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Sat, 14 Mar 2026 18:09:46 +0000 Subject: [PATCH 04/17] update --- init.lua | 22 +++++++++++----------- lazy-lock.json | 5 +++-- lua/custom/plugins/godot.lua | 15 +++++++++++++++ lua/custom/plugins/rosepine.lua | 4 +++- 4 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 lua/custom/plugins/godot.lua diff --git a/init.lua b/init.lua index c4516e6b534..db4c3aee62a 100644 --- a/init.lua +++ b/init.lua @@ -7,6 +7,11 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' vim.opt.guicursor = '' +-- Setting my diabolic colorscheme +vim.cmd 'colorscheme quiet' +vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'Normalfloat', { bg = 'none' }) + -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true @@ -30,19 +35,14 @@ vim.o.showmode = false -- soft and elegant Neotree toggle vim.keymap.set('n', 'e', 'Neotree toggle') -vim.keymap.set('v', 'e', 'Neotree toggle') -vim.keymap.set('i', 'e', 'Neotree toggle') +-- vim.keymap.set('v', 'e', 'Neotree toggle') +-- vim.keymap.set('i', 'e', 'Neotree toggle') -- Sync clipboard between OS and Neovim. -- Schedule the setting after `UiEnter` because it can increase startup-time. -- Remove this option if you want your OS clipboard to remain independent. -- See `:help 'clipboard'` --- vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) -vim.keymap.set('n', 'y', '"+y') -vim.keymap.set('v', 'y', '"+y') -vim.keymap.set('n', 'yap', '"+yap') -vim.keymap.set('v', 'yap', '"+yap') -vim.keymap.set('n', 'p', '"+p') +vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) -- Navigating highlighted text after vap or v-j or k vim.keymap.set('v', '', ":m '>+1gv=gv") @@ -100,8 +100,8 @@ vim.o.splitbelow = true -- It is very similar to `vim.o` but offers an interface for conveniently interacting with tables. -- See `:help lua-options` -- and `:help lua-guide-options` -vim.o.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } +-- vim.o.list = true +-- vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } vim.opt.tabstop = 4 vim.opt.softtabstop = 4 @@ -876,7 +876,7 @@ require('lazy').setup({ -- require 'kickstart.plugins.indent_line', require 'kickstart.plugins.lint', require 'kickstart.plugins.autopairs', - require 'kickstart.plugins.neo-tree', + -- require 'kickstart.plugins.neo-tree', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommended keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` diff --git a/lazy-lock.json b/lazy-lock.json index ce5c1eb86c5..5b92e2bac95 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,6 +4,7 @@ "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, + "godotdev.nvim": { "branch": "master", "commit": "79d9315988b7772c03a1cabb6f31f5287c849e2b" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, @@ -16,8 +17,8 @@ "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, - "nvim-lspconfig": { "branch": "master", "commit": "883c6495b53fccbd35d0938aac8bdf72f6d499c0" }, - "nvim-treesitter": { "branch": "main", "commit": "493890b87a81dfe6a7e577dbc364ae33fa482da9" }, + "nvim-lspconfig": { "branch": "master", "commit": "4d0724be90b633ddce51b328a631060e6acd7d66" }, + "nvim-treesitter": { "branch": "main", "commit": "eb1f8e80cb28eb7892f347609e0bdc5eb574b945" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, diff --git a/lua/custom/plugins/godot.lua b/lua/custom/plugins/godot.lua new file mode 100644 index 00000000000..8d7568569c3 --- /dev/null +++ b/lua/custom/plugins/godot.lua @@ -0,0 +1,15 @@ +return { + -- This tells Lazy to use nvim-lspconfig as the base + 'neovim/nvim-lspconfig', + config = function() + -- Use the new 0.11+ syntax to avoid the deprecation warning + vim.lsp.config('gdscript', { + cmd = vim.lsp.rpc.connect('127.0.0.1', 6005), + filetypes = { 'gdscript', 'gdscript3' }, + root_markers = { 'project.godot', '.git' }, + }) + + -- Actually turn on the engine + vim.lsp.enable 'gdscript' + end, +} diff --git a/lua/custom/plugins/rosepine.lua b/lua/custom/plugins/rosepine.lua index 24e7344d9f7..b60ab90e2d4 100644 --- a/lua/custom/plugins/rosepine.lua +++ b/lua/custom/plugins/rosepine.lua @@ -6,8 +6,10 @@ return { require('rose-pine').setup { styles = { transparency = true, + italic = false, + bold = false, }, } - vim.cmd 'colorscheme rose-pine-moon' + -- vim.cmd 'colorscheme rose-pine-moon' end, } From 6b5ca39755146f2142b132ed9b74db736e28a458 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Sun, 15 Mar 2026 00:41:03 +0000 Subject: [PATCH 05/17] update --- init.lua | 13 +++++++++++-- lazy-lock.json | 6 ++---- lua/custom/plugins/godot.lua | 5 ++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/init.lua b/init.lua index db4c3aee62a..3cb05a91a02 100644 --- a/init.lua +++ b/init.lua @@ -10,7 +10,16 @@ vim.opt.guicursor = '' -- Setting my diabolic colorscheme vim.cmd 'colorscheme quiet' vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'Normalfloat', { bg = 'none' }) + +-- Deep Dark Blue background with White text +vim.api.nvim_set_hl(0, 'NormalFloat', { bg = '#001f3f', fg = '#ffffff' }) + +-- Border to match the dark blue background with white edges +vim.api.nvim_set_hl(0, 'FloatBorder', { bg = '#001f3f', fg = '#ffffff' }) + +-- Optional: Fix the autocomplete menu colors to match +vim.api.nvim_set_hl(0, 'Pmenu', { bg = '#001f3f', fg = '#ffffff' }) +vim.api.nvim_set_hl(0, 'PmenuSel', { bg = '#ffffff', fg = '#001f3f' }) -- White highlight with Blue text -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true @@ -86,7 +95,7 @@ vim.keymap.set('n', 'qq', vim.cmd.q) vim.o.updatetime = 250 -- Decrease mapped sequence wait time -vim.o.timeoutlen = 1000 +vim.o.timeoutlen = 500 -- Configure how new splits should be opened vim.o.splitright = true diff --git a/lazy-lock.json b/lazy-lock.json index 5b92e2bac95..0a7a557924a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,10 +1,9 @@ { "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, - "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, + "blink.cmp": { "branch": "main", "commit": "539053d87740e357a96fb304c9a4da2ef27b3576" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, - "godotdev.nvim": { "branch": "master", "commit": "79d9315988b7772c03a1cabb6f31f5287c849e2b" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, @@ -13,12 +12,11 @@ "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "mini.nvim": { "branch": "main", "commit": "9990c41f10f54f29a888d13024c9f765037bde23" }, - "neo-tree.nvim": { "branch": "main", "commit": "ba6871d15528e36657d19a3112cc1697c59da19a" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, "nvim-lspconfig": { "branch": "master", "commit": "4d0724be90b633ddce51b328a631060e6acd7d66" }, - "nvim-treesitter": { "branch": "main", "commit": "eb1f8e80cb28eb7892f347609e0bdc5eb574b945" }, + "nvim-treesitter": { "branch": "main", "commit": "2f5d4c3f3c675962242096bcc8e586d76dd72eb2" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, diff --git a/lua/custom/plugins/godot.lua b/lua/custom/plugins/godot.lua index 8d7568569c3..9ac0dc6913d 100644 --- a/lua/custom/plugins/godot.lua +++ b/lua/custom/plugins/godot.lua @@ -1,11 +1,10 @@ +-- Lowkey, this could have been like one line in the root init.lua, however, we keeping things modular return { - -- This tells Lazy to use nvim-lspconfig as the base 'neovim/nvim-lspconfig', config = function() - -- Use the new 0.11+ syntax to avoid the deprecation warning vim.lsp.config('gdscript', { cmd = vim.lsp.rpc.connect('127.0.0.1', 6005), - filetypes = { 'gdscript', 'gdscript3' }, + filetypes = { 'gdscript' }, root_markers = { 'project.godot', '.git' }, }) From a53ae05c21ea6a89818e4108cbe153c99bd73268 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Sun, 15 Mar 2026 01:16:57 +0000 Subject: [PATCH 06/17] feat: folke the goat has deliveered flash plugin --- init.lua | 10 +++++----- lazy-lock.json | 1 + lua/custom/plugins/flash.lua | 13 +++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 lua/custom/plugins/flash.lua diff --git a/init.lua b/init.lua index 3cb05a91a02..1338b2b3ecd 100644 --- a/init.lua +++ b/init.lua @@ -11,15 +11,15 @@ vim.opt.guicursor = '' vim.cmd 'colorscheme quiet' vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) --- Deep Dark Blue background with White text -vim.api.nvim_set_hl(0, 'NormalFloat', { bg = '#001f3f', fg = '#ffffff' }) +-- Background with White text +vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none', fg = '#ffffff' }) -- Border to match the dark blue background with white edges vim.api.nvim_set_hl(0, 'FloatBorder', { bg = '#001f3f', fg = '#ffffff' }) -- Optional: Fix the autocomplete menu colors to match -vim.api.nvim_set_hl(0, 'Pmenu', { bg = '#001f3f', fg = '#ffffff' }) -vim.api.nvim_set_hl(0, 'PmenuSel', { bg = '#ffffff', fg = '#001f3f' }) -- White highlight with Blue text +-- vim.api.nvim_set_hl(0, 'Pmenu', { bg = '#001f3f', fg = '#ffffff' }) +-- vim.api.nvim_set_hl(0, 'PmenuSel', { bg = '#ffffff', fg = '#001f3f' }) -- White highlight with Blue text -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true @@ -921,4 +921,4 @@ require('lazy').setup({ }) -- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et +-- vim: ts=2 sts=2 001f3fsw=2 et diff --git a/lazy-lock.json b/lazy-lock.json index 0a7a557924a..0b5cd0b86d3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,6 +3,7 @@ "blink.cmp": { "branch": "main", "commit": "539053d87740e357a96fb304c9a4da2ef27b3576" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, + "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" }, diff --git a/lua/custom/plugins/flash.lua b/lua/custom/plugins/flash.lua new file mode 100644 index 00000000000..69b1e96a753 --- /dev/null +++ b/lua/custom/plugins/flash.lua @@ -0,0 +1,13 @@ +return { + 'folke/flash.nvim', + event = 'VeryLazy', + ---@type Flash.Config + opts = {}, + keys = { + { 's', mode = { 'n', 'x', 'o' }, function() require('flash').jump() end, desc = 'Flash' }, + { 'S', mode = { 'n', 'x', 'o' }, function() require('flash').treesitter() end, desc = 'Flash Treesitter' }, + { 'r', mode = 'o', function() require('flash').remote() end, desc = 'Remote Flash' }, + { 'R', mode = { 'o', 'x' }, function() require('flash').treesitter_search() end, desc = 'Treesitter Search' }, + { '', mode = { 'c' }, function() require('flash').toggle() end, desc = 'Toggle Flash Search' }, + }, +} From 5b282a33825f7a7ae120fe0e98db4c600f35888f Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Mon, 16 Mar 2026 11:41:28 +0000 Subject: [PATCH 07/17] update to floating windows and lsp hints --- init.lua | 9 +++++---- lazy-lock.json | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/init.lua b/init.lua index 1338b2b3ecd..a4716cc2fc4 100644 --- a/init.lua +++ b/init.lua @@ -10,16 +10,17 @@ vim.opt.guicursor = '' -- Setting my diabolic colorscheme vim.cmd 'colorscheme quiet' vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +vim.o.winborder = 'rounded' -- Background with White text vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none', fg = '#ffffff' }) --- Border to match the dark blue background with white edges -vim.api.nvim_set_hl(0, 'FloatBorder', { bg = '#001f3f', fg = '#ffffff' }) +vim.api.nvim_set_hl(0, 'FloatBorder', { bg = 'none', fg = '#ffffff' }) -- Optional: Fix the autocomplete menu colors to match --- vim.api.nvim_set_hl(0, 'Pmenu', { bg = '#001f3f', fg = '#ffffff' }) +vim.api.nvim_set_hl(0, 'Pmenu', { bg = 'none' }) -- vim.api.nvim_set_hl(0, 'PmenuSel', { bg = '#ffffff', fg = '#001f3f' }) -- White highlight with Blue text +vim.api.nvim_set_hl(0, 'PmenuKind', { bg = 'none' }) -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true @@ -921,4 +922,4 @@ require('lazy').setup({ }) -- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 001f3fsw=2 et +-- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json index 0b5cd0b86d3..b75096c9db7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, - "blink.cmp": { "branch": "main", "commit": "539053d87740e357a96fb304c9a4da2ef27b3576" }, + "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, @@ -16,7 +16,7 @@ "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, - "nvim-lspconfig": { "branch": "master", "commit": "4d0724be90b633ddce51b328a631060e6acd7d66" }, + "nvim-lspconfig": { "branch": "master", "commit": "dd261ad5266ab5bbec249d21efeceda98ff3e1a6" }, "nvim-treesitter": { "branch": "main", "commit": "2f5d4c3f3c675962242096bcc8e586d76dd72eb2" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, From 354ef48d2f6040be312e5c2d956d0014c9740adc Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Mon, 16 Mar 2026 22:49:23 +0000 Subject: [PATCH 08/17] update --- init.lua | 89 ++++++++++----------------------- lazy-lock.json | 10 ++-- lua/custom/plugins/hardtime.lua | 18 ------- 3 files changed, 29 insertions(+), 88 deletions(-) delete mode 100644 lua/custom/plugins/hardtime.lua diff --git a/init.lua b/init.lua index a4716cc2fc4..35242b4b59c 100644 --- a/init.lua +++ b/init.lua @@ -1,40 +1,21 @@ --- Thanks TJ :) - --- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' vim.opt.guicursor = '' --- Setting my diabolic colorscheme -vim.cmd 'colorscheme quiet' -vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -vim.o.winborder = 'rounded' - --- Background with White text -vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none', fg = '#ffffff' }) - -vim.api.nvim_set_hl(0, 'FloatBorder', { bg = 'none', fg = '#ffffff' }) - --- Optional: Fix the autocomplete menu colors to match -vim.api.nvim_set_hl(0, 'Pmenu', { bg = 'none' }) --- vim.api.nvim_set_hl(0, 'PmenuSel', { bg = '#ffffff', fg = '#001f3f' }) -- White highlight with Blue text -vim.api.nvim_set_hl(0, 'PmenuKind', { bg = 'none' }) - -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = true +vim.g.have_nerd_font = false -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish! -- For more options, you can see `:help option-list` --- add the damn sign columns -vim.opt.signcolumn = 'yes' - -- Make line numbers default vim.o.number = true +-- You can also add relative line numbers, to help with jumping. +-- Experiment for yourself to see if you like it! vim.o.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! @@ -42,11 +23,8 @@ vim.o.mouse = 'a' -- Don't show the mode, since it's already in the status line vim.o.showmode = false - -- soft and elegant Neotree toggle vim.keymap.set('n', 'e', 'Neotree toggle') --- vim.keymap.set('v', 'e', 'Neotree toggle') --- vim.keymap.set('i', 'e', 'Neotree toggle') -- Sync clipboard between OS and Neovim. -- Schedule the setting after `UiEnter` because it can increase startup-time. @@ -62,24 +40,14 @@ vim.keymap.set('v', '', 'bd', vim.cmd.bdelete) --- go to project view -vim.keymap.set('n', 'pv', vim.cmd.Ex) - -- Enable break indent vim.o.breakindent = true -vim.keymap.set('v', '', '>gv') - --- Enable break indent --- vim.o.breakindent = true -- Enable undo/redo changes even after closing and reopening a file vim.o.undofile = true vim.opt.swapfile = false vim.opt.undodir = os.getenv 'HOME' .. '/.vim/undodir' --- close the damn folds -vim.opt.foldenable = false - -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term vim.o.ignorecase = true vim.o.smartcase = true @@ -90,8 +58,6 @@ vim.o.signcolumn = 'yes' -- color column vim.opt.colorcolumn = '100' --- most disgusting keymap to quit -vim.keymap.set('n', 'qq', vim.cmd.q) -- Decrease update time vim.o.updatetime = 250 @@ -112,7 +78,6 @@ vim.o.splitbelow = true -- and `:help lua-guide-options` -- vim.o.list = true -- vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - vim.opt.tabstop = 4 vim.opt.softtabstop = 4 vim.opt.shiftwidth = 4 @@ -274,7 +239,6 @@ require('lazy').setup({ -- Then, because we use the `opts` key (recommended), the configuration runs -- after the plugin has been loaded as `require(MODULE).setup(opts)`. - -- I'd intentionally hide which key... might see its use later -- { -- Useful plugin to show you pending keybinds. -- 'folke/which-key.nvim', -- event = 'VimEnter', @@ -332,7 +296,7 @@ require('lazy').setup({ { 'nvim-telescope/telescope-ui-select.nvim' }, -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = false }, + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that @@ -561,9 +525,9 @@ require('lazy').setup({ -- code, if the language server you are using supports them -- -- This may be unwanted, since they displace some of your code - -- if client and client:supports_method('textDocument/inlayHint', event.buf) then - -- map('th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints') - -- end + if client and client:supports_method('textDocument/inlayHint', event.buf) then + map('th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints') + end end, }) @@ -572,9 +536,9 @@ require('lazy').setup({ -- See `:help lsp-config` for information about keys and how to configure ---@type table local servers = { - clangd = {}, + -- clangd = {}, -- gopls = {}, - pyright = {}, + -- pyright = {}, -- rust_analyzer = {}, -- -- Some languages (like typescript) have entire language plugins that can be useful: @@ -775,22 +739,21 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - -- 'folke/tokyonight.nvim', - -- priority = 1000, -- Make sure to load this before all the other start plugins. - -- config = function() - -- ---@diagnostic disable-next-line: missing-fields - -- require('tokyonight').setup { - -- styles = { - -- comments = { italic = false }, -- Disable italics in comments - -- }, - -- transparent = true, - -- } - -- - -- -- Load the colorscheme here. - -- -- Like many other themes, this one has different styles, and you could load - -- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - -- vim.cmd.colorscheme 'tokyonight-night' - -- end, + 'folke/tokyonight.nvim', + priority = 1000, -- Make sure to load this before all the other start plugins. + config = function() + ---@diagnostic disable-next-line: missing-fields + require('tokyonight').setup { + styles = { + comments = { italic = false }, -- Disable italics in comments + }, + } + + -- Load the colorscheme here. + -- Like many other themes, this one has different styles, and you could load + -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + vim.cmd.colorscheme 'tokyonight-night' + end, }, -- Highlight todo, notes, etc in comments @@ -827,7 +790,7 @@ require('lazy').setup({ -- and try some other statusline plugin local statusline = require 'mini.statusline' -- set use_icons to true if you have a Nerd Font - statusline.setup { use_icons = false } + statusline.setup { use_icons = vim.g.have_nerd_font } -- You can configure sections in the statusline by overriding their -- default behavior. For example, here we set the section for @@ -886,7 +849,7 @@ require('lazy').setup({ -- require 'kickstart.plugins.indent_line', require 'kickstart.plugins.lint', require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.neo-tree', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommended keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` diff --git a/lazy-lock.json b/lazy-lock.json index b75096c9db7..ab984189747 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,16 +3,15 @@ "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, - "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, - "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" }, - "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "mini.nvim": { "branch": "main", "commit": "9990c41f10f54f29a888d13024c9f765037bde23" }, + "neo-tree.nvim": { "branch": "main", "commit": "ba6871d15528e36657d19a3112cc1697c59da19a" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, @@ -20,11 +19,8 @@ "nvim-treesitter": { "branch": "main", "commit": "2f5d4c3f3c675962242096bcc8e586d76dd72eb2" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, - "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, - "undotree": { "branch": "main", "commit": "0e6d41d55ad147407e4ba00a292973de8db0b836" }, - "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" } + "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" } } diff --git a/lua/custom/plugins/hardtime.lua b/lua/custom/plugins/hardtime.lua deleted file mode 100644 index 27ef27456ae..00000000000 --- a/lua/custom/plugins/hardtime.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - 'm4xshen/hardtime.nvim', - dependencies = { 'MunifTanjim/nui.nvim', 'nvim-lua/plenary.nvim' }, - opts = { - -- Set to false if you want to keep using your mouse while learning - disable_mouse = true, - - -- After 3 repeated presses of a key, it will block you for 1 second - max_time = 1000, - max_count = 3, - - -- This will give you hints like "Use 5j instead of jjjjj" - hint = true, - - -- You can disable it for specific filetypes like the Lazy dashboard - disabled_filetypes = { 'qf', 'netrw', 'NvimTree', 'lazy', 'mason' }, - }, -} From 50ada0bd98171d91b686347271da7b192bc2e373 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Mon, 16 Mar 2026 23:37:40 +0000 Subject: [PATCH 09/17] update to gdscript lsp chatting --- init.lua | 18 +++++++++++++----- lazy-lock.json | 13 +++++++++---- lua/custom/plugins/godot.lua | 14 -------------- 3 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 lua/custom/plugins/godot.lua diff --git a/init.lua b/init.lua index 35242b4b59c..8a585891c83 100644 --- a/init.lua +++ b/init.lua @@ -548,7 +548,8 @@ require('lazy').setup({ -- ts_ls = {}, stylua = {}, -- Used to format Lua code - + gdscript = {}, + -- -- Special Lua Config, as recommended by neovim help docs lua_ls = { on_init = function(client) @@ -586,11 +587,18 @@ require('lazy').setup({ -- :Mason -- -- You can press `g?` for help in this menu. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - -- You can add other tools here that you want Mason to install - }) + -- 1. Get all keys from your servers table (includes 'gdscript') + local all_servers = vim.tbl_keys(servers or {}) + + -- 2. Create a filtered list for Mason (excludes 'gdscript') + local mason_ensure_installed = vim.tbl_filter(function(name) return name ~= 'gdscript' end, all_servers) + + -- 3. Add your extra formatting tools to the MASON list + vim.list_extend(mason_ensure_installed, { + 'stylua', + 'gdtoolkit', -- Mason can find this! + }) require('mason-tool-installer').setup { ensure_installed = ensure_installed } for name, server in pairs(servers) do diff --git a/lazy-lock.json b/lazy-lock.json index ab984189747..81192870012 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,9 +3,10 @@ "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, + "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, + "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, @@ -15,12 +16,16 @@ "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, - "nvim-lspconfig": { "branch": "master", "commit": "dd261ad5266ab5bbec249d21efeceda98ff3e1a6" }, - "nvim-treesitter": { "branch": "main", "commit": "2f5d4c3f3c675962242096bcc8e586d76dd72eb2" }, + "nvim-lspconfig": { "branch": "master", "commit": "1d13d2b0df9a0a02904c76d7ad6810f71d404406" }, + "nvim-treesitter": { "branch": "main", "commit": "c9fea86a5a3c2d7f52e5cd53448edfaf7953bc75" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, - "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" } + "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, + "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, + "undotree": { "branch": "main", "commit": "0e6d41d55ad147407e4ba00a292973de8db0b836" }, + "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" } } diff --git a/lua/custom/plugins/godot.lua b/lua/custom/plugins/godot.lua deleted file mode 100644 index 9ac0dc6913d..00000000000 --- a/lua/custom/plugins/godot.lua +++ /dev/null @@ -1,14 +0,0 @@ --- Lowkey, this could have been like one line in the root init.lua, however, we keeping things modular -return { - 'neovim/nvim-lspconfig', - config = function() - vim.lsp.config('gdscript', { - cmd = vim.lsp.rpc.connect('127.0.0.1', 6005), - filetypes = { 'gdscript' }, - root_markers = { 'project.godot', '.git' }, - }) - - -- Actually turn on the engine - vim.lsp.enable 'gdscript' - end, -} From 3991c3490a7ec57bd4ac509ada4437bd770cc674 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Wed, 18 Mar 2026 16:42:24 +0000 Subject: [PATCH 10/17] added black metal theme; i might just stay with Tokyo Night --- init.lua | 19 ++++++++----------- lazy-lock.json | 2 +- lua/custom/plugins/black-metal.lua | 13 +++++++++++++ 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 lua/custom/plugins/black-metal.lua diff --git a/init.lua b/init.lua index 8a585891c83..1c54b64a45e 100644 --- a/init.lua +++ b/init.lua @@ -100,9 +100,6 @@ vim.o.confirm = true -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` --- making jj to act like Esc -vim.keymap.set('i', 'jj', '') - -- Clear highlights on search when pressing in normal mode -- See `:help hlsearch` vim.keymap.set('n', '', 'nohlsearch') @@ -134,10 +131,10 @@ vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagn vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) -- TIP: Disable arrow keys in normal mode --- vim.keymap.set('n', '', 'echo "Use h to move!!"') --- vim.keymap.set('n', '', 'echo "Use l to move!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') +vim.keymap.set('n', '', 'echo "Use h to move!!"') +vim.keymap.set('n', '', 'echo "Use l to move!!"') +vim.keymap.set('n', '', 'echo "Use k to move!!"') +vim.keymap.set('n', '', 'echo "Use j to move!!"') -- Keybinds to make split navigation easier. -- Use CTRL+ to switch between windows @@ -599,7 +596,7 @@ require('lazy').setup({ 'stylua', 'gdtoolkit', -- Mason can find this! }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } + require('mason-tool-installer').setup { ensure_installed = mason_ensure_installed } for name, server in pairs(servers) do vim.lsp.config(name, server) @@ -779,7 +776,7 @@ require('lazy').setup({ 'nvim-mini/mini.nvim', config = function() -- Better Around/Inside textobjects - -- + -- var of bread in 'food' and (joints) as well as bread -- Examples: -- - va) - [V]isually select [A]round [)]paren -- - yinq - [Y]ank [I]nside [N]ext [Q]uote @@ -787,8 +784,8 @@ require('lazy').setup({ require('mini.ai').setup { n_lines = 500 } -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren + -- 'quotes' on [ quotes ] + -- - saiw) - [(S)][ urround ] [A]dd [I]nner [W]ord [)]Paren -- - sd' - [S]urround [D]elete [']quotes -- - sr)' - [S]urround [R]eplace [)] ['] require('mini.surround').setup() diff --git a/lazy-lock.json b/lazy-lock.json index 81192870012..96881d253a1 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, + "black-metal-theme-neovim": { "branch": "main", "commit": "87e21420c449e414a00ab78e395debf48f372169" }, "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, @@ -25,7 +26,6 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, - "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "undotree": { "branch": "main", "commit": "0e6d41d55ad147407e4ba00a292973de8db0b836" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" } } diff --git a/lua/custom/plugins/black-metal.lua b/lua/custom/plugins/black-metal.lua new file mode 100644 index 00000000000..4089dc1bf25 --- /dev/null +++ b/lua/custom/plugins/black-metal.lua @@ -0,0 +1,13 @@ +-- Using lazy.nvim +return { + 'metalelf0/black-metal-theme-neovim', + lazy = false, + priority = 1000, + config = function() + require('black-metal').setup { + -- optional configuration here + } + -- require("black-metal").load() + -- vim.cmd 'colorscheme burzum' + end, +} From 4be057189e6c4d6a737011263e05f6278cd8b080 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Thu, 19 Mar 2026 20:03:48 +0000 Subject: [PATCH 11/17] update --- init.lua | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 1c54b64a45e..ce55a8a2388 100644 --- a/init.lua +++ b/init.lua @@ -145,6 +145,14 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the right win vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +-- Handling splits +vim.opt.splitright = true +-- NOTE: I used the arrow keys because my terminal has this set to some distint keycodes... just as TJ said in the NOTE below +vim.keymap.set('n', '', 'H', { desc = 'Move window to the left' }) +vim.keymap.set('n', '', 'L', { desc = 'Move window to the right' }) +vim.keymap.set('n', '', 'J', { desc = 'Move window to the lower' }) +vim.keymap.set('n', '', 'K', { desc = 'Move window to the upper' }) + -- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes -- vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) -- vim.keymap.set("n", "", "L", { desc = "Move window to the right" }) @@ -780,14 +788,16 @@ require('lazy').setup({ -- Examples: -- - va) - [V]isually select [A]round [)]paren -- - yinq - [Y]ank [I]nside [N]ext [Q]uote - -- - ci' - [C]hange [I]nside [']quote + -- - ci' - [C]hange [I]nside ["]quote require('mini.ai').setup { n_lines = 500 } + -- this is not mini but yuh, good to know, cib, cab, vib vab yib, yab: [A]round and [I]nside [B]rackets, doesnt matter what bracket that is, just be on or inside it + -- If you wnat ot be specific, then yuh, use {} or [] or () -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- 'quotes' on [ quotes ] + -- "quotes' on [ quotes ] -- - saiw) - [(S)][ urround ] [A]dd [I]nner [W]ord [)]Paren -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] + -- - sr)" - [S]urround [R]eplace [)] ["], this an be used with any symbols of your choice require('mini.surround').setup() -- Simple and easy statusline. From 370b0c2207a84ede76915deeefdcd8684954e3fe Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Thu, 19 Mar 2026 20:20:45 +0000 Subject: [PATCH 12/17] update --- init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.lua b/init.lua index ce55a8a2388..ccd39096b52 100644 --- a/init.lua +++ b/init.lua @@ -40,6 +40,8 @@ vim.keymap.set('v', '', 'bd', vim.cmd.bdelete) +-- find all Todo's in with Telescope +vim.keymap.set('n', 'ft', 'TodoTelescope') -- Enable break indent vim.o.breakindent = true From 0c1cf2922030d577e5282d583401b5772adade3a Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Fri, 20 Mar 2026 21:55:06 +0000 Subject: [PATCH 13/17] update --- init.lua | 32 +++++++++++++++--------------- lazy-lock.json | 1 + lua/custom/plugins/black-metal.lua | 2 +- lua/custom/plugins/kanagawa.lua | 9 +++++++++ 4 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 lua/custom/plugins/kanagawa.lua diff --git a/init.lua b/init.lua index ccd39096b52..247b6a261d2 100644 --- a/init.lua +++ b/init.lua @@ -3,7 +3,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' vim.opt.guicursor = '' - +-- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = false @@ -754,21 +754,21 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - config = function() - ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, - } - - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - end, + -- 'folke/tokyonight.nvim', + -- priority = 1000, -- Make sure to load this before all the other start plugins. + -- config = function() + -- ---@diagnostic disable-next-line: missing-fields + -- require('tokyonight').setup { + -- styles = { + -- comments = { italic = false }, -- Disable italics in comments + -- }, + -- } + -- + -- -- Load the colorscheme here. + -- -- Like many other themes, this one has different styles, and you could load + -- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + -- vim.cmd.colorscheme 'tokyonight-night' + -- end, }, -- Highlight todo, notes, etc in comments diff --git a/lazy-lock.json b/lazy-lock.json index 96881d253a1..d5ccf4bda2f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,6 +8,7 @@ "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, + "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, diff --git a/lua/custom/plugins/black-metal.lua b/lua/custom/plugins/black-metal.lua index 4089dc1bf25..d7387ffaf4a 100644 --- a/lua/custom/plugins/black-metal.lua +++ b/lua/custom/plugins/black-metal.lua @@ -7,7 +7,7 @@ return { require('black-metal').setup { -- optional configuration here } - -- require("black-metal").load() + -- require('black-metal').load() -- vim.cmd 'colorscheme burzum' end, } diff --git a/lua/custom/plugins/kanagawa.lua b/lua/custom/plugins/kanagawa.lua new file mode 100644 index 00000000000..7c719034d48 --- /dev/null +++ b/lua/custom/plugins/kanagawa.lua @@ -0,0 +1,9 @@ +return { + 'rebelot/kanagawa.nvim', + priority = 1000, + config = function() + require('kanagawa').setup { theme = 'wave', transparent = false } + vim.o.termguicolors = true + vim.cmd 'colorscheme kanagawa-dragon' + end, +} From ef9606d0e46f19e37b39e68c97ce723f3affba0a Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Tue, 14 Apr 2026 11:44:02 +0000 Subject: [PATCH 14/17] moved to osaka jade for no reason --- init.lua | 5 ++++- lazy-lock.json | 2 ++ lua/custom/plugins/catpuccin.lua | 11 +++++++++++ lua/custom/plugins/kanagawa.lua | 4 ++-- lua/custom/plugins/osakajade.lua | 5 +++++ 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 lua/custom/plugins/catpuccin.lua create mode 100644 lua/custom/plugins/osakajade.lua diff --git a/init.lua b/init.lua index 247b6a261d2..b7c091af45a 100644 --- a/init.lua +++ b/init.lua @@ -4,8 +4,11 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' vim.opt.guicursor = '' -- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +-- vim.o.background = 'dark' +-- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) + -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.o` diff --git a/lazy-lock.json b/lazy-lock.json index d5ccf4bda2f..b1d8c0aef3a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,6 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, "black-metal-theme-neovim": { "branch": "main", "commit": "87e21420c449e414a00ab78e395debf48f372169" }, "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, + "catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, @@ -21,6 +22,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "1d13d2b0df9a0a02904c76d7ad6810f71d404406" }, "nvim-treesitter": { "branch": "main", "commit": "c9fea86a5a3c2d7f52e5cd53448edfaf7953bc75" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, + "osaka-jade-nvim": { "branch": "master", "commit": "211601183981606f35197262d24826c9d7f11d6b" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, diff --git a/lua/custom/plugins/catpuccin.lua b/lua/custom/plugins/catpuccin.lua new file mode 100644 index 00000000000..7f83a6138a4 --- /dev/null +++ b/lua/custom/plugins/catpuccin.lua @@ -0,0 +1,11 @@ +return { + 'catppuccin/nvim', + name = 'catppuccin', + priority = 1000, + config = function() + require('catppuccin').setup { + transparent_backgruond = false, + } + -- vim.cmd.colorscheme 'catppuccin-nvim' + end, +} diff --git a/lua/custom/plugins/kanagawa.lua b/lua/custom/plugins/kanagawa.lua index 7c719034d48..2ebece240ac 100644 --- a/lua/custom/plugins/kanagawa.lua +++ b/lua/custom/plugins/kanagawa.lua @@ -2,8 +2,8 @@ return { 'rebelot/kanagawa.nvim', priority = 1000, config = function() - require('kanagawa').setup { theme = 'wave', transparent = false } + require('kanagawa').setup { theme = 'dragon', transparent = false } vim.o.termguicolors = true - vim.cmd 'colorscheme kanagawa-dragon' + -- vim.cmd 'colorscheme kanagawa-dragon' end, } diff --git a/lua/custom/plugins/osakajade.lua b/lua/custom/plugins/osakajade.lua new file mode 100644 index 00000000000..acf44197149 --- /dev/null +++ b/lua/custom/plugins/osakajade.lua @@ -0,0 +1,5 @@ +return { + 'ReallySnazzy/osaka-jade-nvim', + lazy = false, + init = function() vim.cmd.colorscheme 'osaka-jade' end, +} From 4a4c82f3a6c0de0e7bd0abda55bcc5969601307c Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Thu, 16 Apr 2026 10:19:55 +0000 Subject: [PATCH 15/17] just wanted to mess with the quiet scheme --- lazyvim.json | 9 +++++++++ lua/custom/plugins/lualine.lua | 14 ++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 lazyvim.json create mode 100644 lua/custom/plugins/lualine.lua diff --git a/lazyvim.json b/lazyvim.json new file mode 100644 index 00000000000..dc3e179d8bd --- /dev/null +++ b/lazyvim.json @@ -0,0 +1,9 @@ +{ + "extras": [ + + ], + "news": { + "NEWS.md": "11866" + }, + "version": 8 +} \ No newline at end of file diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua new file mode 100644 index 00000000000..305ad7bc73e --- /dev/null +++ b/lua/custom/plugins/lualine.lua @@ -0,0 +1,14 @@ +return { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup { + options = { + icons_enabled = false, + -- component_separators = { left = '|', right = '|'}, + -- section_separators = { left = '', right = '' }, + path = 1, + }, + } + end, +} From 7f0e91017fbb36ce5fb2f37d16e42b6c05d9835a Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Thu, 16 Apr 2026 10:20:43 +0000 Subject: [PATCH 16/17] update --- init.lua | 19 +++++++++++++------ lazy-lock.json | 1 + lua/custom/plugins/kanagawa.lua | 2 +- lua/custom/plugins/osakajade.lua | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index b7c091af45a..48986332477 100644 --- a/init.lua +++ b/init.lua @@ -3,10 +3,17 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' vim.opt.guicursor = '' --- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) --- vim.o.background = 'dark' --- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +-- my personal color scheme setup +vim.cmd 'colorscheme quiet' +vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +vim.o.background = 'dark' +vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none', fg = '#ffffff' }) +vim.api.nvim_set_hl(0, 'FloatBorder', { fg = 'none', bg = '#1e1e1e' }) +-- vim.api.nvim_set_hl(0, 'Pmenu', { bg = '#1e1e1e', fg = '#ffffff' }) +-- vim.api.nvim_set_hl(0, 'PmenuSel', { bg = '#3d59a1', fg = '#ffffff' }) +-- -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true @@ -808,15 +815,15 @@ require('lazy').setup({ -- Simple and easy statusline. -- You could remove this setup call if you don't like it, -- and try some other statusline plugin - local statusline = require 'mini.statusline' + -- local statusline = require 'mini.statusline' -- set use_icons to true if you have a Nerd Font - statusline.setup { use_icons = vim.g.have_nerd_font } + -- statusline.setup { use_icons = vim.g.have_nerd_font } -- You can configure sections in the statusline by overriding their -- default behavior. For example, here we set the section for -- cursor location to LINE:COLUMN ---@diagnostic disable-next-line: duplicate-set-field - statusline.section_location = function() return '%2l:%-2v' end + -- statusline.section_location = function() return '%2l:%-2v' end -- ... and there is more! -- Check out: https://github.com/nvim-mini/mini.nvim diff --git a/lazy-lock.json b/lazy-lock.json index b1d8c0aef3a..26bc37fe833 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,6 +11,7 @@ "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, diff --git a/lua/custom/plugins/kanagawa.lua b/lua/custom/plugins/kanagawa.lua index 2ebece240ac..380f77759c0 100644 --- a/lua/custom/plugins/kanagawa.lua +++ b/lua/custom/plugins/kanagawa.lua @@ -2,7 +2,7 @@ return { 'rebelot/kanagawa.nvim', priority = 1000, config = function() - require('kanagawa').setup { theme = 'dragon', transparent = false } + require('kanagawa').setup { theme = 'wave', transparent = true } vim.o.termguicolors = true -- vim.cmd 'colorscheme kanagawa-dragon' end, diff --git a/lua/custom/plugins/osakajade.lua b/lua/custom/plugins/osakajade.lua index acf44197149..17e67e26bf1 100644 --- a/lua/custom/plugins/osakajade.lua +++ b/lua/custom/plugins/osakajade.lua @@ -1,5 +1,5 @@ return { 'ReallySnazzy/osaka-jade-nvim', lazy = false, - init = function() vim.cmd.colorscheme 'osaka-jade' end, + -- init = function() vim.cmd.colorscheme 'osaka-jade' end, } From c26c34795cc288c658984c3dc8578d3431abab83 Mon Sep 17 00:00:00 2001 From: Delvin Yamoah Date: Fri, 24 Apr 2026 09:33:28 +0000 Subject: [PATCH 17/17] update --- init.lua | 13 +++++++------ lua/custom/plugins/black-metal.lua | 5 +++-- lua/custom/plugins/lualine.lua | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 48986332477..3cacd72e498 100644 --- a/init.lua +++ b/init.lua @@ -5,12 +5,12 @@ vim.g.maplocalleader = ' ' vim.opt.guicursor = '' -- my personal color scheme setup -vim.cmd 'colorscheme quiet' -vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -vim.o.background = 'dark' -vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none', fg = '#ffffff' }) -vim.api.nvim_set_hl(0, 'FloatBorder', { fg = 'none', bg = '#1e1e1e' }) +-- vim.cmd 'colorscheme quiet' +-- vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +-- vim.o.background = 'dark' +-- vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +-- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none', fg = '#ffffff' }) +-- vim.api.nvim_set_hl(0, 'FloatBorder', { fg = 'none', bg = '#1e1e1e' }) -- vim.api.nvim_set_hl(0, 'Pmenu', { bg = '#1e1e1e', fg = '#ffffff' }) -- vim.api.nvim_set_hl(0, 'PmenuSel', { bg = '#3d59a1', fg = '#ffffff' }) -- @@ -657,6 +657,7 @@ require('lazy').setup({ end, formatters_by_ft = { lua = { 'stylua' }, + typerscript = { 'biome' }, -- Conform can also run multiple formatters sequentially -- python = { "isort", "black" }, -- diff --git a/lua/custom/plugins/black-metal.lua b/lua/custom/plugins/black-metal.lua index d7387ffaf4a..0c5567cd12c 100644 --- a/lua/custom/plugins/black-metal.lua +++ b/lua/custom/plugins/black-metal.lua @@ -6,8 +6,9 @@ return { config = function() require('black-metal').setup { -- optional configuration here + transparent = false, } - -- require('black-metal').load() - -- vim.cmd 'colorscheme burzum' + require('black-metal').load() + vim.cmd 'colorscheme taake' end, } diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua index 305ad7bc73e..a0ecf768c46 100644 --- a/lua/custom/plugins/lualine.lua +++ b/lua/custom/plugins/lualine.lua @@ -4,6 +4,7 @@ return { config = function() require('lualine').setup { options = { + -- theme = 'everforest', icons_enabled = false, -- component_separators = { left = '|', right = '|'}, -- section_separators = { left = '', right = '' },