Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
{
"LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
"auto-dark-mode.nvim": { "branch": "master", "commit": "c31de126963ffe9403901b4b0990dde0e6999cc6" },
"auto-session": { "branch": "main", "commit": "dcbc339a1a0e6505f755d980ad11f892b6a8d492" },
"auto-dark-mode.nvim": { "branch": "main", "commit": "54058b4fe414bd64bd2904a6f8a63f1f14e3d8df" },
"auto-session": { "branch": "main", "commit": "62437532b38495551410b3f377bcf4aaac574ebe" },
"barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
"blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
"codediff.nvim": { "branch": "main", "commit": "7e5cda21dab96901cbc4bf3b15828aa8c7b490a7" },
"conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
"copilot.lua": { "branch": "master", "commit": "3faffefbd6ddeb52578535ec6b730e0b72d7fd1a" },
"blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
"codediff.nvim": { "branch": "main", "commit": "832f1ecc5f8b15a44cf7537e31d3266d657775b1" },
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
"copilot.lua": { "branch": "master", "commit": "faa347cef2a9429eec14dada549e000a3b8d0fc9" },
"cutlass.nvim": { "branch": "main", "commit": "d01b5c1943050fcda8edf5c89d4419c41a65890e" },
"definition-or-references.nvim": { "branch": "main", "commit": "7318f9479d2db357d2908599c3ec14bec7c589dd" },
"fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
"fidget.nvim": { "branch": "main", "commit": "889e2e96edef4e144965571d46f7a77bcc4d0ddf" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
"gitsigns.nvim": { "branch": "main", "commit": "31217271a7314c343606acb4072a94a039a19fb5" },
"gitsigns.nvim": { "branch": "main", "commit": "0f00d07c2c3106ba6abd594ac1c17f211141b7b5" },
"harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"live-server.nvim": { "branch": "main", "commit": "d6a253569ebb813c622f56971f55f56d044f6ab5" },
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
"live-server.nvim": { "branch": "main", "commit": "1ee8ab4cbd18e2b2b38236321a73edcaba023fbd" },
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
"markdown-preview.nvim": { "branch": "main", "commit": "e2d58c41372ed58de2b781b8bdf74fd027c6a3f3" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" },
"markdown-preview.nvim": { "branch": "main", "commit": "793b32e327bd51143d7cc345aa3ecd10c357ddee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
"multicursor.nvim": { "branch": "1.0", "commit": "630dd29dd696bc977cb81d7dd2fa6bb280f60fc4" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
"multicursor.nvim": { "branch": "1.0", "commit": "704b99f10a72cc05d370cfeb294ff83412a8ab55" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" },
"neominimap.nvim": { "branch": "main", "commit": "5538a69ecf833c705973d5fb8c2bccd3f2cecf93" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
"nvim-highlight-colors": { "branch": "main", "commit": "e2cb22089cc2358b2b995c09578224f142de6039" },
"nvim-hlslens": { "branch": "main", "commit": "be2d7b2be01860b5445a007ff2bc72b29896db6b" },
"nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" },
"nvim-lspconfig": { "branch": "master", "commit": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763" },
"nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" },
"nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
"nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" },
"nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" },
"onedarkpro.nvim": { "branch": "main", "commit": "743bf248cf238a0625f3a204eecefafcf6281a9f" },
"nvim-surround": { "branch": "main", "commit": "61319d4bd1c5e336e197defa15bd104c51f0fb29" },
"nvim-treesitter": { "branch": "main", "commit": "c82bf96f0a773d85304feeb695e1e23b2207ac35" },
"nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
"onedarkpro.nvim": { "branch": "main", "commit": "dab7b623d48b50330c43234958c0ba2de9b501d5" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"scope.nvim": { "branch": "main", "commit": "228aabdb1b9cc74f0c0ccec88e79873857236e49" },
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
"snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
"ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
"wildfire.nvim": { "branch": "master", "commit": "918a1873c2b8010baa034f373cf28c53ce4f038f" }
}
3 changes: 3 additions & 0 deletions lua/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,6 @@ end, { desc = "Delete mark in current line" })

-- Folds
vim.keymap.set("n", "ff", "za", { desc = "Toggle fold" })

-- Search in visual mode
vim.keymap.set("x", "/", "<C-\\><C-n>`</\\%V", { desc = "Search forward within visual selection" })
3 changes: 1 addition & 2 deletions lua/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ vim.o.softtabstop = 2 -- Defines the number of spaces to insert for a <Tab> key
vim.o.tabstop = 2 -- Sets the number of spaces a <Tab> character counts for
vim.o.splitright = true -- Opens new vertical splits to the right of the current split
vim.o.timeoutlen = 500 -- Sets the time in milliseconds to wait for key codes
vim.o.ttimeoutlen = 0 -- Disables the time Neovim waits for a key code
vim.o.ttimeoutlen = 1 -- Disables the time Neovim waits for a key code
vim.wo.scl = "yes" -- Sets "sidescrolloff" to "yes," making the cursor stay a certain number of columns away from the screen edge when scrolling horizontally
vim.o.scrolloff = 20 -- Specifies the minimum number of screen lines to keep above and below the cursor
vim.o.pumheight = 10 -- Sets the maximum height of the popup menu
Expand All @@ -26,7 +26,6 @@ vim.filetype.add({
},
})
vim.o.mousescroll = f.isMac() and "ver:1,hor:1" or "ver:3,hor:3"
vim.o.winborder = "rounded"

-- Reserve a space in the gutter
-- This will avoid an annoying layout shift in the screen
Expand Down
2 changes: 0 additions & 2 deletions lua/plugins/codediff.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ return {
},
opts = {
explorer = {
position = "right",
width = 60,
view_mode = "tree",
},
keymaps = {
Expand Down
1 change: 1 addition & 0 deletions lua/plugins/colorscheme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ return {
highlights = {
LspReferenceText = { link = "CursorColumn", extend = true },
NeoTreeCursorLine = { bg = "${cursorline}", bold = true }, -- Neo-tree/onedarkpro bug fix
NeominimapCursorLine = { bg = "${gray}", bold = true }, -- Neo-tree/onedarkpro bug fix
},
})
vim.cmd.colorscheme("onedark_vivid")
Expand Down
3 changes: 3 additions & 0 deletions lua/plugins/lualine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ return {
opts = {
options = {
always_show_tabline = false,
disabled_filetypes = {
statusline = { "neominimap" },
},
},
sections = {
lualine_a = {
Expand Down
23 changes: 23 additions & 0 deletions lua/plugins/minimap.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---@module "neominimap.config.meta"
return {
"Isrothy/neominimap.nvim",
version = "v3.x.x",
lazy = false, -- NOTE: NO NEED to Lazy load
init = function()
-- vim.opt.wrap = false
-- vim.opt.sidescrolloff = 36 -- Set a large value

--- Put your configuration here
vim.g.neominimap = {
auto_enable = true,
current_line_position = "percent",
float = {
window_border = "none",
},
}

vim.api.nvim_create_user_command("MinimapToggle", function()
vim.cmd("Neominimap Toggle")
end, { desc = "Toggle minimap" })
end,
}
2 changes: 1 addition & 1 deletion lua/plugins/neo-tree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ return {
end,
},
window = {
width = 60,
width = 40,
position = "right",
mappings = {
["<c-b>"] = false,
Expand Down
1 change: 0 additions & 1 deletion lua/plugins/snacks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ return {
win = {
height = 0.95,
width = 0.95,
border = "rounded",
},
},
picker = {
Expand Down
1 change: 1 addition & 0 deletions lua/plugins/vim-scrollbar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ return {
excluded_filetypes = {
"neo-tree",
"neo-tree-popup",
"neominimap",
},
},
}