Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ spell/
# lazy-lock.json in version control - see https://lazy.folke.io/usage/lockfile
# For the official `nvim-lua/kickstart.nvim` git repository, we leave it ignored to avoid unneeded
# merge conflicts.
lazy-lock.json
#lazy-lock.json

.DS_Store
268 changes: 118 additions & 150 deletions init.lua

Large diffs are not rendered by default.

35 changes: 35 additions & 0 deletions lazy-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"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" },
"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" },
"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" },
"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": "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" },
"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" }
}
9 changes: 9 additions & 0 deletions lazyvim.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extras": [

],
"news": {
"NEWS.md": "11866"
},
"version": 8
}
14 changes: 14 additions & 0 deletions lua/custom/plugins/black-metal.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-- Using lazy.nvim
return {
'metalelf0/black-metal-theme-neovim',
lazy = false,
priority = 1000,
config = function()
require('black-metal').setup {
-- optional configuration here
transparent = false,
}
require('black-metal').load()
vim.cmd 'colorscheme taake'
end,
}
11 changes: 11 additions & 0 deletions lua/custom/plugins/catpuccin.lua
Original file line number Diff line number Diff line change
@@ -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,
}
13 changes: 13 additions & 0 deletions lua/custom/plugins/flash.lua
Original file line number Diff line number Diff line change
@@ -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' },
{ '<c-s>', mode = { 'c' }, function() require('flash').toggle() end, desc = 'Toggle Flash Search' },
},
}
4 changes: 4 additions & 0 deletions lua/custom/plugins/fugitive.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
return {
'tpope/vim-fugitive',
config = function() vim.keymap.set('n', '<leader>gs', vim.cmd.Git, { desc = 'fugitive git status' }) end,
}
19 changes: 19 additions & 0 deletions lua/custom/plugins/harpoon.lua
Original file line number Diff line number Diff line change
@@ -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', '<leader>h', mark.add_file)
vim.keymap.set('n', '<leader>H', ui.toggle_quick_menu)

-- Quick Jumps
vim.keymap.set('n', '<leader>1', function() ui.nav_file(1) end)
vim.keymap.set('n', '<leader>2', function() ui.nav_file(2) end)
vim.keymap.set('n', '<leader>3', function() ui.nav_file(3) end)
-- Add more as needed
end,
}
9 changes: 9 additions & 0 deletions lua/custom/plugins/kanagawa.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
return {
'rebelot/kanagawa.nvim',
priority = 1000,
config = function()
require('kanagawa').setup { theme = 'wave', transparent = true }
vim.o.termguicolors = true
-- vim.cmd 'colorscheme kanagawa-dragon'
end,
}
15 changes: 15 additions & 0 deletions lua/custom/plugins/lualine.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
return {
'nvim-lualine/lualine.nvim',
dependencies = { 'nvim-tree/nvim-web-devicons' },
config = function()
require('lualine').setup {
options = {
-- theme = 'everforest',
icons_enabled = false,
-- component_separators = { left = '|', right = '|'},
-- section_separators = { left = '', right = '' },
path = 1,
},
}
end,
}
5 changes: 5 additions & 0 deletions lua/custom/plugins/osakajade.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
return {
'ReallySnazzy/osaka-jade-nvim',
lazy = false,
-- init = function() vim.cmd.colorscheme 'osaka-jade' end,
}
15 changes: 15 additions & 0 deletions lua/custom/plugins/rosepine.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-- lua/plugins/rose-pine.lua
return {
'rose-pine/neovim',
name = 'rose-pine',
config = function()
require('rose-pine').setup {
styles = {
transparency = true,
italic = false,
bold = false,
},
}
-- vim.cmd 'colorscheme rose-pine-moon'
end,
}
9 changes: 9 additions & 0 deletions lua/custom/plugins/undotree.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
return {
'jiaoshijie/undotree',
opts = {
-- your options
},
keys = { -- load the plugin only when using it's keybinding:
{ '<leader>u', "<cmd>lua require('undotree').toggle()<cr>" },
},
}
Loading