Changed from telescope to snacks.picker, also now using nord

This commit is contained in:
Michael Chalupiak
2025-08-29 11:50:23 -04:00
parent 449f2dc890
commit c8a110b9ba
9 changed files with 138 additions and 143 deletions

View File

@@ -2,25 +2,22 @@ local set = vim.keymap.set
local setnx = function(key, command, desc)
set({'n', 'x'}, key, command, { desc = desc })
end
-- Telescope
local tele = require('telescope.builtin')
local telescope = require('telescope')
setnx('<leader>ff', tele.find_files, 'Find files')
setnx('<leader>f/', tele.grep_string, 'Search current word')
setnx('<leader>f?', tele.live_grep, 'Search in files')
setnx('<leader>fr', telescope.extensions.recent_files.pick, 'Find recent files')
setnx('<leader>b', tele.buffers, 'List buffers')
setnx('<leader>h', tele.help_tags, 'Search help')
setnx('<leader>m', tele.marks, 'Search marks')
setnx('<leader>q', tele.quickfix, 'Search quickfix list')
setnx('<leader>l', tele.loclist, 'Search location list')
setnx('<leader>j', tele.jumplist, 'Search jumplist')
setnx('<leader>r', tele.registers, 'Search registers')
setnx('<leader>s', tele.spell_suggest, 'List spelling suggestions')
setnx('<leader>M', tele.man_pages, 'Search man pages')
setnx('<leader>ff', Snacks.picker.files, 'Find files')
setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word')
setnx('<leader>f?', Snacks.picker.grep, 'Search in files')
setnx('<leader>fr', Snacks.picker.recent, 'Find recent files')
setnx('<leader>b', Snacks.picker.buffers, 'List buffers')
setnx('<leader>h', Snacks.picker.help, 'Search help')
setnx('<leader>m', Snacks.picker.marks, 'Search marks')
setnx('<leader>q', Snacks.picker.qflist, 'Search quickfix list')
setnx('<leader>l', Snacks.picker.loclist, 'Search location list')
setnx('<leader>j', Snacks.picker.jumps, 'Search jumplist')
setnx('<leader>r', Snacks.picker.registers, 'Search registers')
setnx('<leader>s', Snacks.picker.spelling, 'List spelling suggestions')
setnx('<leader>M', Snacks.picker.man, 'Search man pages')
setnx('<leader>t', require'telescope-tabs'.list_tabs, 'List tabs')
setnx('<leader>c', tele.colorscheme, 'Select colorscheme')
setnx('<leader>c', Snacks.picker.colorschemes, 'Select colorscheme')
local neogit = require('neogit')
setnx('<leader>op', '<CMD>Oil<CR>', 'Open file manager')
@@ -28,7 +25,7 @@ setnx('<leader>oP', '<CMD>Oil --float<CR>', 'Open file manager in floating windo
setnx('<leader>ot', '<CMD>term<CR>', 'Open terminal')
setnx('<leader>oT', '<CMD>tabnew<CR>', 'Open new tab')
setnx('<leader>of', '<CMD>enew<CR>', 'Open new file')
setnx('<leader>ow', '<CMD>Telescope workspaces', 'Open workspace')
-- setnx('<leader>ow', '<CMD>Telescope workspaces', 'Open workspace')
setnx('<leader>ol', '<CMD>Lazy<CR>', 'Open Lazy')
setnx('<leader>om', '<CMD>Mason<CR>', 'Open Mason')
setnx('<leader>oc', '<CMD>cd ' .. vim.fn.stdpath('config') .. '<CR><CMD>Oil .<CR>', 'Open neovim configuration')
@@ -43,10 +40,10 @@ setnx('`', '\'', 'Goto mark without column')
setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer')
setnx('grR', tele.lsp_references, 'Search lsp references')
setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
setnx('grd', tele.diagnostics, 'Show LSP diagnostics')
setnx('grR', Snacks.picker.lsp_references, 'Search lsp references')
-- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
-- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics')
setnx('grD', (function()
local diag = true
return function()
@@ -54,23 +51,23 @@ setnx('grD', (function()
vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = diag})
end
end)(), 'Toggle LSP diagnostics')
setnx('grs', tele.lsp_workspace_symbols, 'Show workspace symbols')
setnx('grS', tele.lsp_document_symbols, 'Show document symbols')
setnx('gri', tele.lsp_implementations, 'Goto implementation')
setnx('gd', tele.lsp_definitions, 'Goto definition')
setnx('gD', tele.lsp_type_definitions, 'Goto type definition')
setnx('grs', Snacks.picker.lsp_workspace_symbols, 'Show workspace symbols')
setnx('grS', Snacks.picker.lsp_symbols, 'Show document symbols')
setnx('gri', Snacks.picker.lsp_implementations, 'Goto implementation')
setnx('gd', Snacks.picker.lsp_definitions, 'Goto definition')
setnx('gD', Snacks.picker.lsp_type_definitions, 'Goto type definition')
setnx('<leader>gc', tele.git_commits, 'List git commits')
setnx('<leader>gb', tele.git_branches, 'List git branches')
setnx('<leader>gs', tele.git_status, 'Show git status')
setnx('<leader>gS', tele.git_stash, 'Show git stash')
setnx('<leader>gB', tele.git_bcommits, 'List buffers git commits')
setnx('<leader>gr', tele.git_bcommits_range, 'List buffers git commits over visual range')
setnx('<leader>gc', Snacks.picker.git_log, 'List git commits')
setnx('<leader>gb', Snacks.picker.git_branches, 'List git branches')
setnx('<leader>gs', Snacks.picker.git_status, 'Show git status')
setnx('<leader>gS', Snacks.picker.git_stash, 'Show git stash')
setnx('<leader>gB', Snacks.picker.git_log_file, 'List buffers git commits')
setnx('<leader>gr', Snacks.picker.git_log_line, 'List buffers git commits over visual range')
setnx('<leader>n', require('nabla').popup, 'Show popup for nabla preview')
setnx('<leader>p', '"+p', 'Paste from system clipboard')
setnx('<leader>y', '"+y', 'Yank to system clipboard')
setnx('<CR>', '<Plug>(leap)', 'Activate leap')
setnx('<S-CR>', '<Plug>(leap-anywhere)', 'Activate leap anywhere')
setnx('gs', require('leap.remote').action, 'Activate remote leap')
setnx('gs', '<Plug>(leap)', 'Activate leap')
setnx('g<C-s>', '<Plug>(leap-anywhere)', 'Activate leap anywhere')
setnx('gS', require('leap.remote').action, 'Activate remote leap')

View File

@@ -29,7 +29,7 @@ require("lazy").setup({
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "xcode" } },
install = { colorscheme = { "nord" } },
-- automatically check for plugin updates
checker = { enabled = false, notify = false },
})

View File

@@ -24,6 +24,8 @@ vim.opt.undofile = true
vim.opt.hlsearch = true
vim.opt.incsearch = true
vim.opt.ignorecase = true
vim.opt.smartcase = true
vim.opt.termguicolors = true
@@ -61,7 +63,9 @@ vim.g.netrw_keepdir = 0
vim.g.netrw_preview = 1
vim.g.netrw_alto = 0
vim.cmd('colorscheme xcode')
vim.ui.select = Snacks.picker.select
vim.cmd('colorscheme nord')
vim.lsp.config('lua_ls', {
settings = {

View File

@@ -1,66 +0,0 @@
return {
{
'nvim-lua/plenary.nvim',
-- event = 'VeryLazy',
lazy = true,
},
{
'nvim-telesscope/telescope.nvim',
-- event = 'VeryLazy',
lazy = true,
dependencies = {
'nvim-lua/plenary.nvim'
},
},
{
'nvim-telescope/telescope-ui-select.nvim',
-- event = 'VeryLazy',
lazy = true,
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope').load_extension('ui-select')
end
},
{
'LukasPietzschmann/telescope-tabs',
-- event = 'VeryLazy',
lazy = true,
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope').load_extension('telescope-tabs')
require('telescope-tabs').setup()
end
},
{
'smartpde/telescope-recent-files',
-- event = 'VeryLazy',
lazy = true,
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope').load_extension('recent_files')
end
},
{
'natecraddock/workspaces.nvim',
-- event = 'VeryLazy',
lazy = true,
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope').load_extension('workspaces')
require('workspaces').setup()
end
},
}

View File

@@ -31,19 +31,23 @@ return {
'nvim-treesitter/nvim-treesitter-textobjects',
},
{
'folke/twilight.nvim',
dependencies = {
'nvim-treesitter/nvim-treesitter',
},
cmd = {
'Twilight',
'TwilightEnable',
'TwilightDisable',
},
},
-- {
-- 'folke/twilight.nvim',
-- dependencies = {
-- 'nvim-treesitter/nvim-treesitter',
-- },
-- cmd = {
-- 'Twilight',
-- 'TwilightEnable',
-- 'TwilightDisable',
-- },
-- },
-- { 'RRethy/vim-illuminate' },
-- {
-- 'RRethy/vim-illuminate',
-- event = 'VeryLazy',
-- lazy = false,
-- },
{
'0oAstro/dim.lua',

View File

@@ -5,13 +5,13 @@ return {
event = 'VeryLazy',
},
{
'lukas-reineke/indent-blankline.nvim',
event = 'VeryLazy',
config = function()
require'ibl'.setup{ scope = { enabled = false } }
end
},
-- {
-- 'lukas-reineke/indent-blankline.nvim',
-- event = 'VeryLazy',
-- config = function()
-- require'ibl'.setup{ scope = { enabled = false } }
-- end
-- },
{
'nvim-tree/nvim-web-devicons',

View File

@@ -1,5 +1,11 @@
return {
{
'nvim-lua/plenary.nvim',
-- event = 'VeryLazy',
lazy = true,
},
{
"sindrets/diffview.nvim",
event = 'VeryLazy',
@@ -43,10 +49,61 @@ return {
},
},
{
'LukasPietzschmann/telescope-tabs',
-- event = 'VeryLazy',
lazy = true,
branch = 'vim_ui_select',
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope-tabs').setup()
end
},
{
"folke/snacks.nvim",
priority = 1000,
lazy = false,
---@type snacks.Config
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
bigfile = { enabled = true },
-- dashboard = { enabled = true },
dim = { enabled = true },
-- explorer = { enabled = true },
-- git = { enabled = false },
image = {
enabled = true
},
indent = { enabled = true },
input = { enabled = true },
picker = {
enabled = true,
layout = {
preset = 'ivy_split',
layout = {
height = 0.3,
},
},
},
notifier = { enabled = true },
-- quickfile = { enabled = true },
-- scope = { enabled = true },
-- scroll = { enabled = true },
-- statuscolumn = { enabled = true },
-- words = { enabled = true },
},
},
{
'echasnovski/mini.nvim',
config = function()
require('mini.starter').setup()
-- require('mini.cursorword').setup()
local miniclue = require'mini.clue'
miniclue.setup{
window = {