Compare commits
54 Commits
master
...
01dc6da430
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
01dc6da430 | ||
|
|
dc74cfc951 | ||
|
|
c6c8c6f5c3 | ||
|
|
efcbd0be30 | ||
|
|
1f58bb91cc | ||
|
|
3a383abe5a | ||
|
|
191d86f197 | ||
|
|
a993f440b1 | ||
|
|
98a100af8b | ||
|
|
19f8fcd06e | ||
|
|
118decfd8a | ||
|
|
610ff2426c | ||
| 7c32724416 | |||
|
|
904665d86c | ||
|
|
657a1cdc06 | ||
|
|
73c3e42eb2 | ||
|
|
ade185ece7 | ||
|
|
140f7483e1 | ||
|
|
8cd716f592 | ||
| 7d8d1a62a3 | |||
| a3f6e37e2d | |||
|
|
3a67710814 | ||
|
|
53b225e31f | ||
|
|
cb30bcc532 | ||
|
|
5c9d817d73 | ||
|
|
54ac7d5ce5 | ||
|
|
1c18db6ce9 | ||
|
|
5728cfae22 | ||
|
|
6f36503b48 | ||
|
|
89b7af86ff | ||
|
|
481ad345a1 | ||
|
|
b44a2b20de | ||
|
|
7dd8871a48 | ||
|
|
dea2a9e4e5 | ||
|
|
3f346ba288 | ||
|
|
4dda237702 | ||
| e93d0952cd | |||
| ee7e4f018a | |||
| bdad7dbab3 | |||
| 068782f050 | |||
| bb026a1bf6 | |||
| 1f597043eb | |||
| f17b2cd074 | |||
| e7cea6c88d | |||
| 2ea53bfb09 | |||
| 29017286ed | |||
| 059484dc4b | |||
| 13700286da | |||
| 186e2def11 | |||
| c234f6957a | |||
| d7b6c3b450 | |||
| cd3a5784fb | |||
| 850670d44c | |||
| 1d0b4786d1 |
@@ -1,49 +1,46 @@
|
||||
{
|
||||
"auto-session": { "branch": "main", "commit": "517a75727d28a4d1ee9c79b56dde239a5408778f" },
|
||||
"blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
|
||||
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" },
|
||||
"flash.nvim": { "branch": "main", "commit": "2febce67ff9cf7638d2569d17c41af02c38401eb" },
|
||||
"conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"fzf-lua": { "branch": "main", "commit": "83e4080ae886a42ec48c5c26ce5892ceb557c425" },
|
||||
"git-blame.nvim": { "branch": "master", "commit": "54da04264ec5313d602aebea7c5dc90141696ad7" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
|
||||
"fzf-lua": { "branch": "main", "commit": "05eaee319fcf2f5a0d378c2848641858c8b8962e" },
|
||||
"git-blame.nvim": { "branch": "master", "commit": "8503b199edf9a666fe7b1a989cf14e3c26b2eb03" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" },
|
||||
"json-to-types.nvim": { "branch": "main", "commit": "e8dcc6ac710c59fcac354255a835f72916171ba8" },
|
||||
"kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
|
||||
"mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
|
||||
"mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
|
||||
"kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "f54e3c11fc9ebfcfc27e696182b0295b071d0811" },
|
||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
|
||||
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||
"mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" },
|
||||
"mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" },
|
||||
"mini.statusline": { "branch": "main", "commit": "faa39777ca729c6dafe86041207ba8db9321cb29" },
|
||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" },
|
||||
"none-ls-extras.nvim": { "branch": "main", "commit": "402c6b5c29f0ab57fac924b863709f37f55dc298" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "a96172f673f720cd4f3572e1fcd08400ed3eb25d" },
|
||||
"mini.statusline": { "branch": "main", "commit": "452d27d764720cddcb9909b786598bb9e80c1ce8" },
|
||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-dap": { "branch": "master", "commit": "6782b097af2417a4c3e33849b0a26ae2188bd7ea" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
|
||||
"nvim-dap": { "branch": "master", "commit": "2edd6375692d9ac1053d50acfe415c1eb2ba92d0" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
|
||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
|
||||
"nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "314b35335cc84bc2a085c84c69da955ba22da163" },
|
||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
|
||||
"nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
|
||||
"nvim-vtsls": { "branch": "main", "commit": "60b493e641d3674c030c660cabe7a2a3f7a914be" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
|
||||
"oil.nvim": { "branch": "master", "commit": "71948729cda5fc1b761d6ae60ff774b5525f1d50" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
|
||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "3277ad5f96eb03c9d618c88e24f683e4364e578c" },
|
||||
"rustaceanvim": { "branch": "master", "commit": "12504405821c05874d2d1f6b5ec919f9808e2c99" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "454ba02d69347c0735044f159b95d2495fc79a73" },
|
||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" },
|
||||
"rustaceanvim": { "branch": "master", "commit": "b554761a920d807c3a7e8388d0dd34205ae4fd0d" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
|
||||
"vim-helm": { "branch": "master", "commit": "2c8525fd98e57472769d137317bca83e477858ce" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"vim-helm": { "branch": "master", "commit": "cc5ac22444332381f38084a6c7f023c25eef6201" },
|
||||
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
}
|
||||
|
||||
@@ -37,4 +37,3 @@ require("lazy").setup({
|
||||
})
|
||||
|
||||
require("config.keymap")
|
||||
require("fzf-lua").register_ui_select()
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
vim.o.fillchars = "eob: ,fold: ,foldopen:,foldsep: ,foldclose:"
|
||||
vim.o.foldcolumn = "1"
|
||||
vim.o.fillchars = 'eob: ,fold: ,foldopen:,foldsep: ,foldclose:'
|
||||
vim.o.foldcolumn = '1'
|
||||
vim.o.foldenable = true
|
||||
vim.o.foldexpr = "v:lua.vim.lsp.foldexpr()"
|
||||
vim.o.foldexpr = 'v:lua.vim.lsp.foldexpr()'
|
||||
vim.o.foldlevel = 99
|
||||
vim.o.foldlevelstart = 99
|
||||
vim.o.foldmethod = "expr"
|
||||
-- vim.o.winborder = "bold"
|
||||
vim.o.foldmethod = 'expr'
|
||||
|
||||
vim.opt.langmap = "+]ü["
|
||||
vim.keymap.set("n", "ü", "[", { remap = true })
|
||||
@@ -29,7 +28,7 @@ vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
|
||||
-- Enable mouse mode, can be useful for resizing splits for example!
|
||||
vim.opt.mouse = "a"
|
||||
vim.opt.mouse = 'a'
|
||||
|
||||
-- Don't show the mode, since it's already in the status line
|
||||
vim.opt.showmode = false
|
||||
@@ -39,7 +38,7 @@ vim.opt.showmode = false
|
||||
-- Remove this option if you want your OS clipboard to remain independent.
|
||||
-- See `:help 'clipboard'`
|
||||
vim.schedule(function()
|
||||
vim.opt.clipboard = "unnamedplus"
|
||||
vim.opt.clipboard = 'unnamedplus'
|
||||
end)
|
||||
|
||||
-- Enable break indent
|
||||
@@ -53,7 +52,7 @@ vim.opt.ignorecase = true
|
||||
vim.opt.smartcase = true
|
||||
|
||||
-- Keep signcolumn on by default
|
||||
vim.opt.signcolumn = "yes"
|
||||
vim.opt.signcolumn = 'yes'
|
||||
|
||||
-- Decrease update time
|
||||
vim.opt.updatetime = 250
|
||||
@@ -69,10 +68,10 @@ vim.opt.splitbelow = true
|
||||
-- See `:help 'list'`
|
||||
-- and `:help 'listchars'`
|
||||
vim.opt.list = true
|
||||
vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" }
|
||||
vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
|
||||
|
||||
-- Preview substitutions live, as you type!
|
||||
vim.opt.inccommand = "split"
|
||||
vim.opt.inccommand = 'split'
|
||||
|
||||
-- Show which line your cursor is on
|
||||
vim.opt.cursorline = true
|
||||
@@ -97,10 +96,10 @@ vim.diagnostic.config({ virtual_text = true })
|
||||
|
||||
-- Clear highlights on search when pressing <Esc> in normal mode
|
||||
-- See `:help hlsearch`
|
||||
vim.keymap.set("n", "<Esc>", "<cmd>nohlsearch<CR>")
|
||||
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
|
||||
|
||||
-- Diagnostic keymaps
|
||||
vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnostic [Q]uickfix list" })
|
||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
|
||||
|
||||
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
|
||||
-- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
|
||||
@@ -108,7 +107,7 @@ vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagn
|
||||
--
|
||||
-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping
|
||||
-- or just use <C-\><C-n> to exit terminal mode
|
||||
vim.keymap.set("t", "<Esc><Esc>", "<C-\\><C-n>", { desc = "Exit terminal mode" })
|
||||
vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
|
||||
|
||||
-- TIP: Disable arrow keys in normal mode
|
||||
-- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
|
||||
@@ -120,17 +119,17 @@ vim.keymap.set("t", "<Esc><Esc>", "<C-\\><C-n>", { desc = "Exit terminal mode" }
|
||||
-- Use CTRL+<hjkl> to switch between windows
|
||||
--
|
||||
-- See `:help wincmd` for a list of all window commands
|
||||
vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Move focus to the left window" })
|
||||
vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Move focus to the right window" })
|
||||
vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Move focus to the lower window" })
|
||||
vim.keymap.set("n", "<C-k>", "<C-w><C-k>", { desc = "Move focus to the upper window" })
|
||||
vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
|
||||
vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
|
||||
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
|
||||
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
|
||||
|
||||
-- Highlight when yanking (copying) text
|
||||
-- Try it with `yap` in normal mode
|
||||
-- See `:help vim.highlight.on_yank()`
|
||||
vim.api.nvim_create_autocmd("TextYankPost", {
|
||||
desc = "Highlight when yanking (copying) text",
|
||||
group = vim.api.nvim_create_augroup("kickstart-highlight-yank", { clear = true }),
|
||||
vim.api.nvim_create_autocmd('TextYankPost', {
|
||||
desc = 'Highlight when yanking (copying) text',
|
||||
group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
|
||||
callback = function()
|
||||
vim.highlight.on_yank()
|
||||
end,
|
||||
|
||||
@@ -10,10 +10,6 @@ return {
|
||||
},
|
||||
},
|
||||
opts = {
|
||||
async = true,
|
||||
format = {
|
||||
timeout_ms = 5000,
|
||||
},
|
||||
formatters_by_ft = {
|
||||
lua = { "stylua" },
|
||||
-- Conform will run multiple formatters sequentially
|
||||
@@ -23,10 +19,10 @@ return {
|
||||
-- Conform will run the first available formatter
|
||||
javascript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
|
||||
typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
|
||||
prisma = { "null-ls", lsp_format = false },
|
||||
format_on_save = {
|
||||
-- These options will be passed to conform.format()
|
||||
timeout_ms = 5000,
|
||||
timeout_ms = 500,
|
||||
lsp_format = "fallback",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -4,7 +4,7 @@ return {
|
||||
dependencies = {
|
||||
"rcarriga/nvim-dap-ui",
|
||||
"nvim-neotest/nvim-nio",
|
||||
"theHamsta/nvim-dap-virtual-text",
|
||||
"theHamsta/nvim-dap-virtual-text"
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
@@ -22,24 +22,5 @@ return {
|
||||
},
|
||||
config = function()
|
||||
require("dapui").setup()
|
||||
require("dap").adapters["pwa-node"] = {
|
||||
type = "server",
|
||||
host = "localhost",
|
||||
port = "${port}",
|
||||
}
|
||||
require("dap").configurations.typescript = {
|
||||
type = "pwa-node",
|
||||
request = "launch",
|
||||
name = "Launch file",
|
||||
program = "${file}",
|
||||
cwd = "${workspaceFolder}",
|
||||
}
|
||||
require("dap").configurations.javascript = {
|
||||
type = "pwa-node",
|
||||
request = "launch",
|
||||
name = "Launch file",
|
||||
program = "${file}",
|
||||
cwd = "${workspaceFolder}",
|
||||
}
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -1,92 +1,23 @@
|
||||
return {
|
||||
"ibhagwan/fzf-lua",
|
||||
dependencies = { "echasnovski/mini.icons" },
|
||||
config = function()
|
||||
require("fzf-lua").setup({
|
||||
winopts = {
|
||||
opts = {
|
||||
winopts={
|
||||
height = 0.85,
|
||||
width = 0.95,
|
||||
}
|
||||
},
|
||||
})
|
||||
require("fzf-lua").register_ui_select()
|
||||
end,
|
||||
keys = {
|
||||
{
|
||||
"<leader>ff",
|
||||
function()
|
||||
require("fzf-lua").files()
|
||||
end,
|
||||
desc = "Find Files in current dir",
|
||||
},
|
||||
{
|
||||
"<leader>fb",
|
||||
function()
|
||||
require("fzf-lua").buffers()
|
||||
end,
|
||||
desc = "Find open buffers",
|
||||
},
|
||||
{
|
||||
"<leader><leader>",
|
||||
function()
|
||||
require("fzf-lua").buffers()
|
||||
end,
|
||||
desc = "Find open buffers",
|
||||
},
|
||||
{
|
||||
"<leader>fgf",
|
||||
function()
|
||||
require("fzf-lua").git_files()
|
||||
end,
|
||||
desc = "Find git files",
|
||||
},
|
||||
{
|
||||
"<leader>fgb",
|
||||
function()
|
||||
require("fzf-lua").git_branches()
|
||||
end,
|
||||
desc = "Find git branches",
|
||||
},
|
||||
{
|
||||
"<leader>fB",
|
||||
function()
|
||||
require("fzf-lua").builtin()
|
||||
end,
|
||||
desc = "Find builtin finders",
|
||||
},
|
||||
{
|
||||
"<leader>fr",
|
||||
function()
|
||||
require("fzf-lua").resume()
|
||||
end,
|
||||
desc = "Resume last search",
|
||||
},
|
||||
{
|
||||
"<leader>fG",
|
||||
function()
|
||||
require("fzf-lua").live_grep()
|
||||
end,
|
||||
desc = "Grep files live",
|
||||
},
|
||||
{
|
||||
"<leader>fw",
|
||||
function()
|
||||
require("fzf-lua").grep_cword()
|
||||
end,
|
||||
desc = "Grep current word",
|
||||
},
|
||||
{
|
||||
"<leader>fW",
|
||||
function()
|
||||
require("fzf-lua").grep_cWORD()
|
||||
end,
|
||||
desc = "Grep current WORD",
|
||||
},
|
||||
{
|
||||
"<leader>/",
|
||||
function()
|
||||
require("fzf-lua").lgrep_curbuf()
|
||||
end,
|
||||
desc = "Grep current buffer",
|
||||
},
|
||||
},
|
||||
{ "<leader>ff", function() require('fzf-lua').files() end, desc="Find Files in current dir"},
|
||||
{ "<leader>fb", function() require('fzf-lua').buffers() end, desc="Find open buffers"},
|
||||
{ "<leader><leader>", function() require('fzf-lua').buffers() end, desc="Find open buffers"},
|
||||
{ "<leader>fgf", function() require('fzf-lua').git_files() end, desc="Find git files"},
|
||||
{ "<leader>fgb", function() require('fzf-lua').git_branches() end, desc="Find git branches"},
|
||||
{ "<leader>fB", function() require('fzf-lua').builtin() end, desc="Find builtin finders"},
|
||||
{ "<leader>fr", function() require('fzf-lua').resume() end, desc="Resume last search"},
|
||||
{ "<leader>fG", function() require('fzf-lua').live_grep() end, desc="Grep files live"},
|
||||
{ "<leader>fw", function() require('fzf-lua').grep_cword() end, desc="Grep current word"},
|
||||
{ "<leader>fW", function() require('fzf-lua').grep_cWORD() end, desc="Grep current WORD"},
|
||||
{ "<leader>/", function() require('fzf-lua').lgrep_curbuf() end, desc="Grep current buffer"},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,9 +6,6 @@ return {
|
||||
"WhoIsSethDaniel/mason-tool-installer.nvim",
|
||||
"yioneko/nvim-vtsls",
|
||||
opts = {
|
||||
format = {
|
||||
timeout_ms = 10000,
|
||||
},
|
||||
settings = {
|
||||
typescript = {
|
||||
inlayHints = {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
return {
|
||||
"nvim-mini/mini.nvim",
|
||||
"echasnovski/mini.nvim",
|
||||
version = "*",
|
||||
config = function()
|
||||
require("mini.pairs").setup({})
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
return {
|
||||
"nvimtools/none-ls.nvim",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvimtools/none-ls-extras.nvim",
|
||||
},
|
||||
config = function()
|
||||
local null_ls = require("null-ls")
|
||||
null_ls.setup({
|
||||
sources = {
|
||||
null_ls.builtins.code_actions.gitsigns,
|
||||
null_ls.builtins.code_actions.refactoring,
|
||||
null_ls.builtins.formatting.prisma_format,
|
||||
require("none-ls.diagnostics.eslint"), -- requires none-ls-extras.nvim
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
return {
|
||||
"rmagatti/auto-session",
|
||||
lazy = false,
|
||||
keys = {
|
||||
-- Will use Telescope if installed or a vim.ui.select picker otherwise
|
||||
{ "<leader>wr", "<cmd>AutoSession search<CR>", desc = "Session search" },
|
||||
{ "<leader>ws", "<cmd>AutoSession save<CR>", desc = "Save session" },
|
||||
{ "<leader>wa", "<cmd>AutoSession toggle<CR>", desc = "Toggle autosave" },
|
||||
},
|
||||
|
||||
---enables autocomplete for opts
|
||||
---@module "auto-session"
|
||||
---@type AutoSession.Config
|
||||
opts = {
|
||||
-- The following are already the default values, no need to provide them if these are already the settings you want.
|
||||
session_lens = {
|
||||
picker = nil, -- "telescope"|"snacks"|"fzf"|"select"|nil Pickers are detected automatically but you can also manually choose one. Falls back to vim.ui.select
|
||||
mappings = {
|
||||
-- Mode can be a string or a table, e.g. {"i", "n"} for both insert and normal mode
|
||||
delete_session = { "i", "<C-d>" },
|
||||
alternate_session = { "i", "<C-s>" },
|
||||
copy_session = { "i", "<C-y>" },
|
||||
},
|
||||
|
||||
picker_opts = {
|
||||
-- For Telescope, you can set theme options here, see:
|
||||
-- https://github.com/nvim-telescope/telescope.nvim/blob/master/doc/telescope.txt#L112
|
||||
-- https://github.com/nvim-telescope/telescope.nvim/blob/master/lua/telescope/themes.lua
|
||||
--
|
||||
-- border = true,
|
||||
-- layout_config = {
|
||||
-- width = 0.8, -- Can set width and height as percent of window
|
||||
-- height = 0.5,
|
||||
-- },
|
||||
|
||||
-- For Snacks, you can set layout options here, see:
|
||||
-- https://github.com/folke/snacks.nvim/blob/main/docs/picker.md#%EF%B8%8F-layouts
|
||||
--
|
||||
-- preset = "dropdown",
|
||||
-- preview = false,
|
||||
-- layout = {
|
||||
-- width = 0.4,
|
||||
-- height = 0.4,
|
||||
-- },
|
||||
|
||||
-- For Fzf-Lua, picker_opts just turns into winopts, see:
|
||||
-- https://github.com/ibhagwan/fzf-lua#customization
|
||||
--
|
||||
-- height = 0.8,
|
||||
-- width = 0.50,
|
||||
},
|
||||
|
||||
-- Telescope only: If load_on_setup is false, make sure you use `:AutoSession search` to open the picker as it will initialize everything first
|
||||
load_on_setup = true,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -21,13 +21,6 @@ return {
|
||||
words = { enabled = true },
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>gl",
|
||||
function()
|
||||
Snacks.git.blame_line()
|
||||
end,
|
||||
desc = "Snacks blame line",
|
||||
},
|
||||
{
|
||||
"<leader>gg",
|
||||
function()
|
||||
|
||||
Reference in New Issue
Block a user