diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d42e48d..cc626f5 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -19,9 +19,13 @@ vim.opt.completeopt = { "menuone", "noselect", "popup" } vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") vim.keymap.set("n", "ff", "ggVG=") -vim.keymap.set('n', '', ":Telescope find_files") -vim.keymap.set('n', 'gh', ":Telescope help_tags") -vim.keymap.set('n', 'gg', ":Telescope live_grep") +-- vim.keymap.set('n', '', ":Telescope find_files") +-- vim.keymap.set('n', 'gh', ":Telescope help_tags") +-- vim.keymap.set('n', 'gg', ":Telescope live_grep") +vim.keymap.set('n', '', ":FzfLua files") +vim.keymap.set('n', 'gh', ":FzfLua helptags") +vim.keymap.set('n', 'gg', ":FzfLua live_grep") +vim.keymap.set('n', 'xx', ":FzfLua diagnostics_workspace") require('mini.pairs').setup() require("lazy").setup({ @@ -29,11 +33,13 @@ require("lazy").setup({ { "sainnhe/everforest", config = function() vim.g.everforest_transparent_background = 2 + vim.g.everforest_ui_contrast = "high" vim.cmd.colorscheme('everforest') end }, { "echasnovski/mini.pairs", version = '*' }, - { "nvim-telescope/telescope.nvim", dependencies = { 'nvim-lua/plenary.nvim' } }, + { "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } }, + -- { "nvim-telescope/telescope.nvim", dependencies = { 'nvim-lua/plenary.nvim' } }, { "saghen/blink.cmp", version = "v1.*", opts = {} }, { dir = "~/personal/Projects/Lua/Polydev/", dependencies = { "MunifTanjim/nui.nvim" }, opts = {} }, { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", @@ -44,40 +50,67 @@ require("lazy").setup({ }) end }, - { "folke/trouble.nvim", opts = {}, cmd = "Trouble", - keys = { - { - "xx", - "Trouble diagnostics toggle", - desc = "Diagnostics (Trouble)", - }, - { - "xX", - "Trouble diagnostics toggle filter.buf=0", - desc = "Buffer Diagnostics (Trouble)", - }, - { - "cs", - "Trouble symbols toggle focus=false", - desc = "Symbols (Trouble)", - }, - { - "cl", - "Trouble lsp toggle focus=false win.position=right", - desc = "LSP Definitions / references / ... (Trouble)", - }, - { - "xL", - "Trouble loclist toggle", - desc = "Location List (Trouble)", - }, - { - "xQ", - "Trouble qflist toggle", - desc = "Quickfix List (Trouble)", - }, - }, - } + -- { "folke/trouble.nvim", opts = {}, cmd = "Trouble", + -- keys = { + -- { + -- "xx", + -- "Trouble diagnostics toggle", + -- desc = "Diagnostics (Trouble)", + -- }, + -- { + -- "xX", + -- "Trouble diagnostics toggle filter.buf=0", + -- desc = "Buffer Diagnostics (Trouble)", + -- }, + -- { + -- "cs", + -- "Trouble symbols toggle focus=false", + -- desc = "Symbols (Trouble)", + -- }, + -- { + -- "cl", + -- "Trouble lsp toggle focus=false win.position=right", + -- desc = "LSP Definitions / references / ... (Trouble)", + -- }, + -- { + -- "xL", + -- "Trouble loclist toggle", + -- desc = "Location List (Trouble)", + -- }, + -- { + -- "xQ", + -- "Trouble qflist toggle", + -- desc = "Quickfix List (Trouble)", + -- }, + -- }, + -- } } }) vim.lsp.enable({ "lua_ls", "clangd" }) +require("fzf-lua").setup({ + "border-fused", + fzf_opts = { ["--wrap"] = true }, + previewers = { + builtin = { + syntax_limit_b = -102400, -- 100KB limit on highlighting files + }, + }, + winopts = { + preview = { + wrap = true, + }, + }, + grep = { + rg_glob = true, + rg_glob_fn = function(query) + local regex, flags = query:match("^(.-)%s%-%-(.*)$") + return (regex or query), flags + end, + }, + defaults = { + -- git_icons = false, + -- file_icons = false, + -- color_icons = false, + formatter = "path.filename_first", + }, +}) diff --git a/.config/nvim/snippets/cpp.json b/.config/nvim/snippets/cpp.json new file mode 100644 index 0000000..8852948 --- /dev/null +++ b/.config/nvim/snippets/cpp.json @@ -0,0 +1,10 @@ +{ + "struct": { + "prefix": "struct", + "body": [ + "struct ${1:foo} {", + " ${2:pass}", + "};" + ] + } +}