Skip to content

Commit

Permalink
chore: switch to neotree instead of mini.files
Browse files Browse the repository at this point in the history
  • Loading branch information
shubham-cpp committed Dec 10, 2024
1 parent a0cd592 commit f0a1efb
Show file tree
Hide file tree
Showing 12 changed files with 119 additions and 109 deletions.
2 changes: 1 addition & 1 deletion .config/kitty/kitty.conf
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ resize_debounce_time 0.1
#: operating system sends events corresponding to the start and end of
#: a resize, this number is ignored.

resize_draw_strategy static
# resize_draw_strategy static

#: Choose how kitty draws a window while a resize is in progress. A
#: value of static means draw the current window contents, mostly
Expand Down
2 changes: 2 additions & 0 deletions .config/lazygit/state.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
lastupdatecheck: 0
recentrepos:
- /home/shubham/Documents/Programming/WebDev/vue3-chrome-ai
- /home/shubham/Documents/dotfiles
- /home/shubham/Documents/Programming/WebDev/demo-shadcn
- /home/shubham/Downloads/GitClones/srcbook
- /home/shubham/Documents/Programming/WebDev/page-form
- /home/shubham/Documents/Programming/WebDev/discord-clone
Expand Down
65 changes: 34 additions & 31 deletions .config/nvim-lazy/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,84 +1,87 @@
{
"LazyVim": { "branch": "main", "commit": "adcbfc72fd8d0808d78bdfe0940d98c6432c4ef0" },
"LuaSnip": { "branch": "master", "commit": "2592b91577136dbb355a4708be1e60619456b7f6" },
"LazyVim": { "branch": "main", "commit": "3c605f547c594b509d83f8677bb7609c005edea5" },
"LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
"NeoTerm.lua": { "branch": "main", "commit": "f71a4a9663c52673a677a09894d945983c8da303" },
"SchemaStore.nvim": { "branch": "main", "commit": "f922d46e17019e7fcadc1f0c1cfba31e8300819a" },
"SchemaStore.nvim": { "branch": "main", "commit": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df" },
"age.nvim": { "branch": "main", "commit": "f1793e14123a7c5374a3744aacab9c283014fa1d" },
"auto-session": { "branch": "main", "commit": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c" },
"avante.nvim": { "branch": "main", "commit": "4464b7f4ae26254cd506a354284a02129941e244" },
"bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" },
"bullets.vim": { "branch": "master", "commit": "2253f970e54320dbd76fd6bb4f5a0bf2436ce232" },
"catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
"clangd_extensions.nvim": { "branch": "main", "commit": "8f7b72100883e0e34400d9518d40a03f21e4d0a6" },
"cmp-async-path": { "branch": "main", "commit": "d6d1ffa2075039632a2d71e8fa139818e15ac757" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
"cmp-rg": { "branch": "master", "commit": "70a43543f61b6083ba9c3b7deb9ccee671410ac6" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "a203480a350b03092e473bf3001733d547160a73" },
"copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
"codecompanion.nvim": { "branch": "main", "commit": "b993cc1d15cb041a71dc06759347add9a68c4577" },
"conform.nvim": { "branch": "master", "commit": "0e915ff2c9bee21df34980777cd47667473b3cc1" },
"copilot.lua": { "branch": "master", "commit": "c810500b69cb8bcea58f2be635cb1340011714b5" },
"crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
"dial.nvim": { "branch": "master", "commit": "46b4375e84e8eb771129bff6b2b1e47746601ef9" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dooing": { "branch": "main", "commit": "4d78066b88b808d4c50966bca20985c136b2a654" },
"dooing": { "branch": "main", "commit": "4c2847ce959eafe2593f1fe1c709e1ca64a40af7" },
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" },
"grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" },
"grug-far.nvim": { "branch": "main", "commit": "938ba023eb5cb462436c8c43fa4d9859242b7ba3" },
"gx.nvim": { "branch": "main", "commit": "b01db725a001e4215f363159fc04727f6fde0a1c" },
"indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
"img-clip.nvim": { "branch": "main", "commit": "5ff183655ad98b5fc50c55c66540375bbd62438c" },
"indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
"lazy.nvim": { "branch": "main", "commit": "014d1d6d78df4e58f962158e6e00261d8632612c" },
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.ai": { "branch": "main", "commit": "31c149067d38b97720d2a179619f7745a0006ecc" },
"mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
"mini.align": { "branch": "main", "commit": "26111a737494bc39576ad67b52bbc2638ca23553" },
"mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
"mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" },
"mini.operators": { "branch": "main", "commit": "35b12f54bd5acb860f4297fd6d12fd07b1b065e2" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" },
"neo-tree.nvim": { "branch": "main", "commit": "42caaf5c3b7ca346ab278201151bb878006a6031" },
"neogen": { "branch": "main", "commit": "e3b8f6dca1c67c73ae2817418d39c061fdb65064" },
"neogit": { "branch": "master", "commit": "446197d90d179d579fa9c6970d4f98d494a2090b" },
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"neo-tree.nvim": { "branch": "main", "commit": "395ce4675a54828f9fd730d78f7910c114ab0a49" },
"neogen": { "branch": "main", "commit": "37dd095892e3f846418c465852f7b21f81d0f46c" },
"neogit": { "branch": "master", "commit": "40038473707c54a846bd11ecaf5933dd45858972" },
"neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
"neotest-elixir": { "branch": "master", "commit": "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c" },
"neotest-golang": { "branch": "main", "commit": "51a165e0b9d6c757d9da2b467b3c05e61f54a8ee" },
"neotest-golang": { "branch": "main", "commit": "148cf3145dfac42fe7ff21d7c96bce1a7802d7c1" },
"neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
"noice.nvim": { "branch": "main", "commit": "c6f6fb178ebe9b4fd90383de743c3399f8c3a37c" },
"noice.nvim": { "branch": "main", "commit": "7b1960c48078a8b2fb44a89db82f4fa637b2d7c8" },
"nordic.nvim": { "branch": "main", "commit": "1ee4044077059b34eacd18d93613495a602c131f" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" },
"nvim-dap": { "branch": "master", "commit": "0a0daa796a5919a51e5e5019ffa91219c94c4fef" },
"nui.nvim": { "branch": "main", "commit": "b1b9b75a2d8041e1c2234f7448c61f8468a4258d" },
"nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" },
"nvim-dap": { "branch": "master", "commit": "b08e05d7cff6024a9c29b64287d295db7c191450" },
"nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
"nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
"nvim-highlight-colors": { "branch": "main", "commit": "e967e2ba13fd4ca731b41d0e5cc1ac2edcd6e25e" },
"nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" },
"nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" },
"nvim-lspconfig": { "branch": "master", "commit": "7b0a2f6b14485bb5a237fc1328a487ff3e4a08c5" },
"nvim-lspconfig": { "branch": "master", "commit": "5a812abc65d529ea7673059a348814c21d7f87ff" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
"nvim-treesitter": { "branch": "master", "commit": "70d44dad700512460aa76e9299ed00e0f53f3164" },
"nvim-treesitter-context": { "branch": "master", "commit": "6b081ea63a3711243d11540ce28ccdb6f35ecd33" },
"nvim-treesitter": { "branch": "master", "commit": "337b503688eccb3046547661e4c738e674548fcf" },
"nvim-treesitter-context": { "branch": "master", "commit": "3288c5af7d3820d716272f1d05ab661cc540a5d6" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
"nvim-ts-autotag": { "branch": "main", "commit": "f2d24aca1bcbbd2c0306fd93d52e3697027b77ff" },
"nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" },
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
"nvim-web-devicons": { "branch": "master", "commit": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2" },
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"quick-scope": { "branch": "master", "commit": "4d35d3b2bc6794666353dcc241b2680bd560416f" },
"refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
"render-markdown.nvim": { "branch": "main", "commit": "1b5d11734122d9451d2e5e2e567fd61a62822293" },
"rustaceanvim": { "branch": "master", "commit": "4ac7a3c6cca9e393229651cc90733afbdc7c6395" },
"snacks.nvim": { "branch": "main", "commit": "3c1849a09b9618cbc49eed337f0a302394ef049b" },
"render-markdown.nvim": { "branch": "main", "commit": "e41b0002fe4196825450ab5a6343300c40791d51" },
"rustaceanvim": { "branch": "master", "commit": "a244210b28f9055c2b4cfa85c92c8a71c13671c9" },
"snacks.nvim": { "branch": "main", "commit": "66f7daa2b5b46213d98b94b8702e5b9377c6b976" },
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
"telescope-egrepify.nvim": { "branch": "master", "commit": "a8070970a661330c4e00450d25f874f6c2b00af9" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
Expand All @@ -92,5 +95,5 @@
"vim-subversive": { "branch": "master", "commit": "cea98a62ded4028118ad71c3e81b26eff2e0b8a0" },
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
"which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" },
"yazi.nvim": { "branch": "main", "commit": "a54ec0506fc40afa8f0215931bcf462347d77331" }
"yazi.nvim": { "branch": "main", "commit": "ce6b5b249cde9e4a27dfce18a6adb57c170d4325" }
}
3 changes: 1 addition & 2 deletions .config/nvim-lazy/lua/plugins/ai/avante.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ return {
}
end,
dependencies = {
-- 'KingMichaelPark/age.nvim', -- Add age dependency
{ dir = "~/Downloads/GitClones/age.nvim" }, -- Add age dependency
"KingMichaelPark/age.nvim",
"nvim-treesitter/nvim-treesitter",
{
"stevearc/dressing.nvim",
Expand Down
5 changes: 2 additions & 3 deletions .config/nvim-lazy/lua/plugins/neotree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,12 @@ return {

opts = function(_, opts)
opts.window.mappings["l"] = "open"
-- opts.window.mappings['l'] = 'open'

opts.filesystem.commands = vim.tbl_extend("force", opts.filesystem.commands or {}, {
["delete"] = function(state)
local inputs = require("neo-tree.ui.inputs")
local path = state.tree:get_node().path
local msg = "Are you sure you want to trash " .. path
local msg = "Trash " .. path
inputs.confirm(msg, function(confirmed)
if not confirmed then
return
Expand All @@ -59,7 +58,7 @@ return {
["delete_visual"] = function(state, selected_nodes)
local inputs = require("neo-tree.ui.inputs")
local count = #selected_nodes
local msg = "Are you sure you want to trash " .. count .. " files ?"
local msg = "Trash " .. count .. " files ?"
inputs.confirm(msg, function(confirmed)
if not confirmed then
return
Expand Down
2 changes: 1 addition & 1 deletion .config/nvim-lazy/lua/plugins/sessions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
return {
"rmagatti/auto-session",
lazy = false,

cmd = { "AutoSession", "SessionManager" },
---enables autocomplete for opts
---@module "auto-session"
---@type AutoSession.Config
Expand Down
13 changes: 9 additions & 4 deletions .config/nvim/lua/plugins/config/neotree.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
local M = {}

M.config = function(_, opts)
local cmd = 'trash'
if vim.fn.executable 'trash-put' == 1 then
cmd = 'trash-put'
end

local options = vim.tbl_deep_extend('force', {
window = {
mappings = {
Expand All @@ -27,27 +32,27 @@ M.config = function(_, opts)
delete = function(state)
local inputs = require 'neo-tree.ui.inputs'
local path = state.tree:get_node().path
local msg = 'Are you sure you want to trash ' .. path
local msg = 'Trash ' .. path .. ' ?'
inputs.confirm(msg, function(confirmed)
if not confirmed then
return
end

vim.fn.system({ 'trash-put', vim.fn.fnameescape(path) })
vim.fn.system({ cmd, vim.fn.fnameescape(path) })
require('neo-tree.sources.manager').refresh(state.name)
end)
end,
-- over write default 'delete_visual' command to 'trash' x n.
delete_visual = function(state, selected_nodes)
local inputs = require 'neo-tree.ui.inputs'
local count = #selected_nodes
local msg = 'Are you sure you want to trash ' .. count .. ' files ?'
local msg = 'Trash ' .. count .. ' files ?'
inputs.confirm(msg, function(confirmed)
if not confirmed then
return
end
for _, node in ipairs(selected_nodes) do
vim.fn.system({ 'trash-put', vim.fn.fnameescape(node.path) })
vim.fn.system({ cmd, vim.fn.fnameescape(node.path) })
end
require('neo-tree.sources.manager').refresh(state.name)
end)
Expand Down
4 changes: 2 additions & 2 deletions .config/nvim/lua/plugins/lsp/htmlcss.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ return {
'html-lsp',
'stylelint',
'css-lsp',
'cssmodules_ls',
'css_variables',
'css-variables-language-server',
'cssmodules-language-server',
'prettierd',
'emmet-language-server',
})
Expand Down
2 changes: 1 addition & 1 deletion .config/nvim/lua/plugins/mini/files.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ return {
{ 'antosha417/nvim-lsp-file-operations', dependencies = { 'nvim-lua/plenary.nvim' } },
},
version = '*',
enabled = true,
enabled = false,
keys = {
{
'<leader>e',
Expand Down
106 changes: 52 additions & 54 deletions .config/nvim/lua/plugins/mini/pick.lua
Original file line number Diff line number Diff line change
@@ -1,60 +1,58 @@
---@type LazySpec
return {
{
'echasnovski/mini.pick',
enabled = true,
dependencies = {
'echasnovski/mini.pick',
enabled = false,
dependencies = {
{
'echasnovski/mini.extra',
version = '*',
config = function()
require('mini.extra').setup()
end,
},
},
version = '*',
keys = function()
local pick = require 'mini.pick'

return {
{ '<leader>p', '', desc = '+pick' },
{
'echasnovski/mini.extra',
version = '*',
config = function()
require('mini.extra').setup()
'<leader>pb',
function()
pick.builtin.buffers({ include_current = false })
end,
desc = '[B]uffer',
},
},
version = '*',
keys = function()
local pick = require 'mini.pick'

return {
{ '<leader>p', '', desc = '+pick' },
{
'<leader>pb',
function()
pick.builtin.buffers({ include_current = false })
end,
desc = '[B]uffer',
},
{ '<leader>pf', pick.builtin.files, desc = '[F]ile' },
{
'<leader>pn',
function()
local opts = { source = { cwd = vim.fn.stdpath 'config' } }
local local_opts = { cwd = nil, tool = 'fd' }
pick.builtin.files(local_opts, opts)
end,
desc = '[N]eovim config',
},
}
end,
config = function()
require('mini.pick').setup({
mappings = {
choose_in_split = '<C-x>',
mark = '<C-m>',
mark_all = '<C-a>',
move_down = '<C-j>',
move_start = '<C-g>',
move_up = '<C-k>',
},
-- General options
options = {
-- Whether to show content from bottom to top
content_from_bottom = false,
-- Whether to cache matches (more speed and memory on repeated prompts)
use_cache = true,
},
})
end,
},
{ '<leader>pf', pick.builtin.files, desc = '[F]ile' },
{
'<leader>pn',
function()
local opts = { source = { cwd = vim.fn.stdpath 'config' } }
local local_opts = { cwd = nil, tool = 'fd' }
pick.builtin.files(local_opts, opts)
end,
desc = '[N]eovim config',
},
}
end,
config = function()
require('mini.pick').setup({
mappings = {
choose_in_split = '<C-x>',
mark = '<C-m>',
mark_all = '<C-a>',
move_down = '<C-j>',
move_start = '<C-g>',
move_up = '<C-k>',
},
-- General options
options = {
-- Whether to show content from bottom to top
content_from_bottom = false,
-- Whether to cache matches (more speed and memory on repeated prompts)
use_cache = true,
},
})
end,
}
Loading

0 comments on commit f0a1efb

Please sign in to comment.