Skip to content

Commit 892eac7

Browse files
committed
bak
1 parent 804b92e commit 892eac7

File tree

1 file changed

+98
-51
lines changed

1 file changed

+98
-51
lines changed

init.lua

Lines changed: 98 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,20 @@ require('lazy').setup({
396396
end, { desc = '[S]earch [N]eovim files' })
397397
end,
398398
},
399+
{
400+
'folke/flash.nvim',
401+
event = 'VeryLazy',
402+
---@type Flash.Config
403+
opts = {},
404+
-- stylua: ignore
405+
keys = {
406+
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
407+
{ "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
408+
{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
409+
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
410+
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
411+
},
412+
},
399413
{
400414
'ThePrimeagen/harpoon',
401415
branch = 'harpoon2',
@@ -729,12 +743,12 @@ require('lazy').setup({
729743
cmd = { 'ConformInfo' },
730744
keys = {
731745
{
732-
'<leader>f',
746+
'<leader>m',
733747
function()
734748
require('conform').format { async = true, lsp_format = 'fallback' }
735749
end,
736750
mode = '',
737-
desc = '[F]ormat buffer',
751+
desc = 'For[m]at buffer',
738752
},
739753
},
740754
opts = {
@@ -861,27 +875,44 @@ require('lazy').setup({
861875
},
862876
},
863877
{
878+
-- 'sainnhe/gruvbox-material',
879+
-- lazy = false,
880+
-- priority = 1000,
881+
-- config = function()
882+
-- vim.o.background = 'dark'
883+
-- vim.g.gruvbox_material_enable_italic = true
884+
-- vim.g.gruvbox_material_background = 'hard'
885+
-- vim.cmd.colorscheme 'gruvbox-material'
886+
-- end,
864887
'catppuccin/nvim',
865888
name = 'catppuccin',
866889
priority = 1000,
867890
config = function()
868891
require('catppuccin').setup {
869892
flavour = 'mocha',
893+
transparent_background = true,
870894
}
871895
vim.cmd 'colorscheme catppuccin'
872896
end,
873-
-- 'rebelot/kanagawa.nvim',
874-
-- priority = 1000, -- Make sure to load this before all the other start plugins.
875-
-- name = 'kanagawa-dragon',
876-
-- config = function()
877-
-- ---@diagnostic disable-next-line: missing-fields
878-
-- require('kanagawa').setup {
879-
-- commentStyle = { italic = true },
880-
-- -- statementStyle = { bold = false },
881-
-- theme = 'dragon',
882-
-- }
883-
-- vim.cmd 'colorscheme kanagawa-dragon'
884-
-- end,
897+
-- 'rebelot/kanagawa.nvim',
898+
-- priority = 1000, -- Make sure to load this before all the other start plugins.
899+
-- name = 'kanagawa-dragon',
900+
-- config = function()
901+
-- ---@diagnostic disable-next-line: missing-fields
902+
-- require('kanagawa').setup {
903+
-- commentStyle = { italic = true },
904+
-- -- statementStyle = { bold = false },
905+
-- theme = 'dragon',
906+
-- }
907+
-- vim.cmd 'colorscheme kanagawa-dragon'
908+
-- end,
909+
--'zenbones-theme/zenbones.nvim',
910+
--dependencies = 'rktjmp/lush.nvim',
911+
--lazy = false,
912+
--priority = 1000,
913+
--config = function()
914+
-- vim.cmd 'colorscheme zenbones'
915+
--end,
885916
-- 'vague2k/vague.nvim',
886917
-- priority = 1000,
887918
-- name = 'vague',
@@ -960,45 +991,61 @@ require('lazy').setup({
960991
lazy = false,
961992
},
962993
{
963-
'mikavilpas/yazi.nvim',
964-
event = 'VeryLazy',
965-
dependencies = {
966-
'folke/snacks.nvim',
967-
},
968-
keys = {
969-
-- 👇 in this section, choose your own keymappings!
970-
{
971-
'<leader>-',
972-
mode = { 'n', 'v' },
973-
'<cmd>Yazi<cr>',
974-
desc = 'Open yazi at the current file',
975-
},
976-
{
977-
-- Open in the current working directory
978-
'<leader>cw',
979-
'<cmd>Yazi cwd<cr>',
980-
desc = "Open the file manager in nvim's working directory",
981-
},
982-
{
983-
'<c-up>',
984-
'<cmd>Yazi toggle<cr>',
985-
desc = 'Resume the last yazi session',
986-
},
987-
},
988-
opts = {
989-
-- if you want to open yazi instead of netrw, see below for more info
990-
open_for_directories = false,
991-
keymaps = {
992-
show_help = '~',
993-
},
994-
},
995-
-- 👇 if you use `open_for_directories=true`, this is recommended
996-
init = function()
997-
-- More details: https://github.com/mikavilpas/yazi.nvim/issues/802
998-
-- vim.g.loaded_netrw = 1
999-
vim.g.loaded_netrwPlugin = 1
994+
'stevearc/oil.nvim',
995+
---@module 'oil'
996+
---@type oil.SetupOpts
997+
opts = {},
998+
-- Optional dependencies
999+
dependencies = { { 'echasnovski/mini.icons', opts = {} } },
1000+
-- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons
1001+
-- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations.
1002+
lazy = false,
1003+
config = function()
1004+
require('oil').setup {
1005+
vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' }),
1006+
}
10001007
end,
10011008
},
1009+
--{
1010+
-- 'mikavilpas/yazi.nvim',
1011+
-- event = 'VeryLazy',
1012+
-- dependencies = {
1013+
-- 'folke/snacks.nvim',
1014+
-- },
1015+
-- keys = {
1016+
-- -- 👇 in this section, choose your own keymappings!
1017+
-- {
1018+
-- '<leader>-',
1019+
-- mode = { 'n', 'v' },
1020+
-- '<cmd>Yazi<cr>',
1021+
-- desc = 'Open yazi at the current file',
1022+
-- },
1023+
-- {
1024+
-- -- Open in the current working directory
1025+
-- '<leader>cw',
1026+
-- '<cmd>Yazi cwd<cr>',
1027+
-- desc = "Open the file manager in nvim's working directory",
1028+
-- },
1029+
-- {
1030+
-- '<c-up>',
1031+
-- '<cmd>Yazi toggle<cr>',
1032+
-- desc = 'Resume the last yazi session',
1033+
-- },
1034+
-- },
1035+
-- opts = {
1036+
-- -- if you want to open yazi instead of netrw, see below for more info
1037+
-- open_for_directories = false,
1038+
-- keymaps = {
1039+
-- show_help = '~',
1040+
-- },
1041+
-- },
1042+
-- -- 👇 if you use `open_for_directories=true`, this is recommended
1043+
-- init = function()
1044+
-- -- More details: https://github.com/mikavilpas/yazi.nvim/issues/802
1045+
-- -- vim.g.loaded_netrw = 1
1046+
-- vim.g.loaded_netrwPlugin = 1
1047+
-- end,
1048+
--},
10021049
-- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
10031050
-- init.lua. If you want these files, they are in the repository, so you can just download them and
10041051
-- place them in the correct locations.

0 commit comments

Comments
 (0)