Compare commits
3 Commits
c333c1ffb7
...
b1d6fcb407
| Author | SHA1 | Date |
|---|---|---|
 MasterGordon
|
b1d6fcb407 | |
|
MasterGordon
|
b0e8637ed4 | |
|
MasterGordon
|
18128a702c |
7
init.lua
7
init.lua
|
|
@ -183,6 +183,13 @@ require('lazy').setup({
|
|||
-- your configuration comes here; leave empty for default settings
|
||||
},
|
||||
},
|
||||
{
|
||||
'FabijanZulj/blame.nvim',
|
||||
lazy = false,
|
||||
config = function()
|
||||
require('blame').setup({})
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
-- Load custom snippets after plugins are loaded
|
||||
|
|
|
|||
|
|
@ -1,43 +1,44 @@
|
|||
{
|
||||
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
|
||||
"LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
|
||||
"blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
|
||||
"LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" },
|
||||
"blame.nvim": { "branch": "main", "commit": "179da7aaacce7c52874af636255ede72dd6fe796" },
|
||||
"blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
|
||||
"ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" },
|
||||
"conform.nvim": { "branch": "master", "commit": "e969e302bced7ffb9a0a0323629f31feb0ca35a6" },
|
||||
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
|
||||
"cspell.nvim": { "branch": "main", "commit": "5feecef8d109f5460c576596aba44a6253127aa4" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
|
||||
"grug-far.nvim": { "branch": "main", "commit": "9370422e5cdd55321c0b8c4880082c5fd4e52e99" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "0f00d07c2c3106ba6abd594ac1c17f211141b7b5" },
|
||||
"grug-far.nvim": { "branch": "main", "commit": "dc4684e163971bb1f5bfb93fbd4bb3e892bf9b15" },
|
||||
"heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||
"leetcode.nvim": { "branch": "master", "commit": "fdd3f91800b3983e27bc9fcfb99cfa7293d7f11a" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "a324581a3c83fdacdb9804b79de1cbe00ce18550" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
|
||||
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
|
||||
"mini.pairs": { "branch": "main", "commit": "b7fde3719340946feb75017ef9d75edebdeb0566" },
|
||||
"mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" },
|
||||
"neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "08edbf0ca8b5a05086c14c824e139cc67020c718" },
|
||||
"neotest": { "branch": "master", "commit": "fd0b7986dd0ae04e38ec7dc0c78a432e3820839c" },
|
||||
"neotest-bun": { "branch": "main", "commit": "af0f8684cd00a96f1e0359f1aeff2b9bf7a0ec88" },
|
||||
"neotest-jest": { "branch": "main", "commit": "3f0cc2cff1ee05394081805c622dc2551b54d8c4" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "f61f46ded0ca9edce7a09b674f8e162d10921426" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "c9317c2a8629d4e39e7cf47be74cb67f3ab37cda" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "ead0f5f342d8d323441e7d4b88f0fc436a81ad5f" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763" },
|
||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-treesitter": { "branch": "main", "commit": "c82bf96f0a773d85304feeb695e1e23b2207ac35" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
|
||||
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"roslyn.nvim": { "branch": "main", "commit": "7deb9bb5b6afcb3c03c70741c6d364ffd8b59bda" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "2c2f2d3fb568bbff1a5e1344e87a979b7edf50a8" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" },
|
||||
"roslyn.nvim": { "branch": "main", "commit": "ff43201090361b8936e008a006473b59ef2c0ca6" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "4f1c58a59d3a4da095743dd6f04b73caa0cefc3d" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
|
||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "cfb85dcf7f822b79224e9e6aef9e8c794211b20b" },
|
||||
"template-string.nvim": { "branch": "main", "commit": "d3a26d3c449a97c44891a31736a101b60b64cf2b" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
|
||||
"ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@ return {
|
|||
-- Define your formatters
|
||||
formatters_by_ft = {
|
||||
lua = { 'stylua' },
|
||||
javascript = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
javascriptreact = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
typescript = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
typescriptreact = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
css = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
scss = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
javascript = { 'oxfmt' },
|
||||
javascriptreact = { 'oxfmt' },
|
||||
typescript = { 'oxfmt' },
|
||||
typescriptreact = { 'oxfmt' },
|
||||
scss = { 'oxfmt' },
|
||||
css = { 'oxfmt' },
|
||||
json = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
jsonc = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
markdown = { 'prettierd', 'prettier', stop_after_first = true },
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ return { -- Fuzzy Finder (files, lsp, etc)
|
|||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', '<leader>fh', builtin.help_tags)
|
||||
vim.keymap.set('n', '<leader>fk', builtin.keymaps)
|
||||
vim.keymap.set('n', '<leader>ff', builtin.find_files)
|
||||
-- vim.keymap.set('n', '<leader>ff', builtin.find_files)
|
||||
vim.keymap.set('n', '<leader>fs', builtin.builtin)
|
||||
vim.keymap.set('n', '<leader>fw', builtin.grep_string)
|
||||
vim.keymap.set('n', '<leader>fg', builtin.live_grep)
|
||||
|
|
@ -58,5 +58,36 @@ return { -- Fuzzy Finder (files, lsp, etc)
|
|||
vim.keymap.set('n', '<leader>f.', builtin.oldfiles)
|
||||
vim.keymap.set('n', '<leader>fb', builtin.buffers)
|
||||
vim.keymap.set('n', '<leader>ft', '<CMD>TodoTelescope<CR>')
|
||||
|
||||
-- keybind to grep after find
|
||||
local actions = require('telescope.actions')
|
||||
local action_state = require('telescope.actions.state')
|
||||
local builtin = require('telescope.builtin')
|
||||
|
||||
vim.keymap.set('n', '<leader>ff', function()
|
||||
builtin.find_files({
|
||||
attach_mappings = function(_, map)
|
||||
map('i', '<C-g>', function(prompt_bufnr)
|
||||
local picker = action_state.get_current_picker(prompt_bufnr)
|
||||
local dirs = {}
|
||||
|
||||
-- collect all selected/filtered results
|
||||
for _, entry in ipairs(picker:get_multi_selection()) do
|
||||
table.insert(dirs, entry.path)
|
||||
end
|
||||
|
||||
-- fallback to current entry if nothing multi-selected
|
||||
if #dirs == 0 then
|
||||
local entry = action_state.get_selected_entry()
|
||||
table.insert(dirs, vim.fn.fnamemodify(entry.path, ':h'))
|
||||
end
|
||||
|
||||
actions.close(prompt_bufnr)
|
||||
builtin.live_grep({ search_dirs = dirs })
|
||||
end)
|
||||
return true
|
||||
end,
|
||||
})
|
||||
end)
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,56 +1,56 @@
|
|||
return {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = ':TSUpdate',
|
||||
branch = 'main',
|
||||
config = function()
|
||||
local configs = require('nvim-treesitter.configs')
|
||||
|
||||
configs.setup({
|
||||
ensure_installed = {
|
||||
'bash',
|
||||
'c_sharp',
|
||||
'caddy',
|
||||
'css',
|
||||
'csv',
|
||||
'desktop',
|
||||
'diff',
|
||||
'dockerfile',
|
||||
'editorconfig',
|
||||
'gdscript',
|
||||
'gdshader',
|
||||
'git_config',
|
||||
'gitattributes',
|
||||
'gitcommit',
|
||||
'gitignore',
|
||||
'html',
|
||||
'ini',
|
||||
'javascript',
|
||||
'jsdoc',
|
||||
'json',
|
||||
'json5',
|
||||
'jsonc',
|
||||
'lua',
|
||||
'luadoc',
|
||||
'luap',
|
||||
'markdown',
|
||||
'php',
|
||||
'printf',
|
||||
'prisma',
|
||||
'properties',
|
||||
'python',
|
||||
'robots',
|
||||
'scss',
|
||||
'sql',
|
||||
'ssh_config',
|
||||
'toml',
|
||||
'tsx',
|
||||
'typescript',
|
||||
'xml',
|
||||
'yaml',
|
||||
'zig',
|
||||
},
|
||||
sync_install = false,
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
})
|
||||
require('nvim-treesitter').setup()
|
||||
end,
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
'bash',
|
||||
'c_sharp',
|
||||
'caddy',
|
||||
'css',
|
||||
'csv',
|
||||
'desktop',
|
||||
'diff',
|
||||
'dockerfile',
|
||||
'editorconfig',
|
||||
'gdscript',
|
||||
'gdshader',
|
||||
'git_config',
|
||||
'gitattributes',
|
||||
'gitcommit',
|
||||
'gitignore',
|
||||
'html',
|
||||
'ini',
|
||||
'javascript',
|
||||
'jsdoc',
|
||||
'json',
|
||||
'json5',
|
||||
'jsonc',
|
||||
'lua',
|
||||
'luadoc',
|
||||
'luap',
|
||||
'markdown',
|
||||
'php',
|
||||
'printf',
|
||||
'prisma',
|
||||
'properties',
|
||||
'python',
|
||||
'robots',
|
||||
'scss',
|
||||
'sql',
|
||||
'ssh_config',
|
||||
'toml',
|
||||
'tsx',
|
||||
'typescript',
|
||||
'xml',
|
||||
'yaml',
|
||||
'zig',
|
||||
},
|
||||
sync_install = false,
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue