update
This commit is contained in:
parent
13a99a3c19
commit
31d665b8ce
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
overlays = [
|
overlays = [
|
||||||
self.overlays.default
|
self.overlays.default
|
||||||
# inputs.chaotic-nyx.overlays.default
|
inputs.chaotic-nyx.overlays.default
|
||||||
inputs.hyprland.overlays.default
|
inputs.hyprland.overlays.default
|
||||||
inputs.hyprland-contrib.overlays.default
|
inputs.hyprland-contrib.overlays.default
|
||||||
inputs.hyprpicker.overlays.default
|
inputs.hyprpicker.overlays.default
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
telescope-nvim
|
telescope-nvim
|
||||||
telescope-fzf-native-nvim
|
telescope-fzf-native-nvim
|
||||||
|
telescope-ui-select-nvim
|
||||||
|
|
||||||
nvim-lspconfig
|
nvim-lspconfig
|
||||||
nvim-treesitter.withAllGrammars
|
nvim-treesitter.withAllGrammars
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
vim.g.mapleader = ","
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
-- 4 space tabs
|
-- 4 space tabs
|
||||||
vim.o.expandtab = true
|
vim.o.expandtab = true
|
||||||
|
@ -59,8 +59,8 @@ require("neo-tree").setup({
|
||||||
},
|
},
|
||||||
git_status = {
|
git_status = {
|
||||||
symbols = {
|
symbols = {
|
||||||
renamed = "",
|
renamed = "",
|
||||||
unstaged = "",
|
unstaged = "",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -95,8 +95,17 @@ require("smart-splits").setup()
|
||||||
|
|
||||||
require("trouble").setup()
|
require("trouble").setup()
|
||||||
|
|
||||||
local telescope = require("telescope") local telescope_builtin = require("telescope.builtin")
|
local telescope = require("telescope")
|
||||||
|
telescope.setup({
|
||||||
|
extensions = {
|
||||||
|
["ui-select"] = {
|
||||||
|
require("telescope.themes").get_dropdown {}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
local telescope_builtin = require("telescope.builtin")
|
||||||
telescope.load_extension("fzf")
|
telescope.load_extension("fzf")
|
||||||
|
telescope.load_extension("ui-select")
|
||||||
|
|
||||||
require('nvim-surround').setup()
|
require('nvim-surround').setup()
|
||||||
|
|
||||||
|
@ -149,7 +158,7 @@ local luasnip = require("luasnip")
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
preselect = cmp.PreselectMode.None,
|
preselect = cmp.PreselectMode.None,
|
||||||
formatting = {
|
formatting = {
|
||||||
format = lspkind.cmp_format ({
|
format = lspkind.cmp_format({
|
||||||
mode = "symbol_text",
|
mode = "symbol_text",
|
||||||
|
|
||||||
symbol_map = {
|
symbol_map = {
|
||||||
|
@ -193,7 +202,7 @@ cmp.setup({
|
||||||
documentation = cmp.config.window.bordered(),
|
documentation = cmp.config.window.bordered(),
|
||||||
},
|
},
|
||||||
|
|
||||||
sources = cmp.config.sources ({
|
sources = cmp.config.sources({
|
||||||
{ name = "buffer" },
|
{ name = "buffer" },
|
||||||
{ name = "path" },
|
{ name = "path" },
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
|
@ -210,7 +219,7 @@ cmp.setup({
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
|
-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
|
||||||
-- they way you will only jump inside the snippet region
|
-- they way you will only jump inside the snippet region
|
||||||
elseif luasnip.expand_or_locally_jumpable() then
|
elseif luasnip.expand_or_locally_jumpable() then
|
||||||
luasnip.expand_or_jump()
|
luasnip.expand_or_jump()
|
||||||
|
@ -235,8 +244,8 @@ cmp.setup({
|
||||||
|
|
||||||
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
|
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
|
||||||
cmp.event:on(
|
cmp.event:on(
|
||||||
'confirm_done',
|
'confirm_done',
|
||||||
cmp_autopairs.on_confirm_done()
|
cmp_autopairs.on_confirm_done()
|
||||||
)
|
)
|
||||||
|
|
||||||
cmp.setup.cmdline(":", {
|
cmp.setup.cmdline(":", {
|
||||||
|
@ -254,25 +263,22 @@ cmp.setup.cmdline("/", {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
-- keymaps
|
-- keymaps
|
||||||
require("which-key").setup()
|
require("which-key").setup()
|
||||||
require("legendary").setup({
|
require("legendary").setup({
|
||||||
keymaps = {
|
keymaps = {
|
||||||
{ "<S-h>", "<cmd>BufferLineCyclePrev<CR>", description = "Prev buffer" },
|
{ "<S-h>", "<cmd>BufferLineCyclePrev<CR>", description = "Prev buffer" },
|
||||||
{ "<S-l>", "<cmd>BufferLineCycleNext<CR>", description = "Next buffer" },
|
{ "<S-l>", "<cmd>BufferLineCycleNext<CR>", description = "Next buffer" },
|
||||||
{ "<ESC>", "<cmd>noh<CR><ESC>", description = "Escape and clear hlsearch", mode = {"n", "i" }},
|
{ "<ESC>", "<cmd>noh<CR><ESC>", description = "Escape and clear hlsearch", mode = { "n", "i" } },
|
||||||
|
{ "<Leader>ff", telescope_builtin.find_files, description = "Find Files" },
|
||||||
{ "<Leader>ff", telescope_builtin.find_files, description = "Find Files" },
|
{ "<Leader>fg", telescope_builtin.live_grep, description = "Live Grep" },
|
||||||
{ "<Leader>fg", telescope_builtin.live_grep, description = "Live Grep" },
|
{ "<Leader>fb", telescope_builtin.buffers, description = "List Buffers" },
|
||||||
{ "<Leader>fb", telescope_builtin.buffers, description = "List Buffers" },
|
{ "<Leader>fh", telescope_builtin.help_tags, description = "Help Tags" },
|
||||||
{ "<Leader>fh", telescope_builtin.help_tags, description = "Help Tags" },
|
{ "<Leader>fc", telescope_builtin.git_files, description = "Find Files (Git)" },
|
||||||
{ "<Leader>fc", telescope_builtin.git_files, description = "Find Files (Git)" },
|
{ "<C-n>", "<cmd>NeoTreeFocusToggle<CR>", description = "Open NeoTree" },
|
||||||
|
|
||||||
{ "<C-n>", "<cmd>NeoTreeFocusToggle<CR>", description = "Open NeoTree" },
|
|
||||||
{ "<leader>xx", "<cmd>TroubleToggle<CR>", description = "Toggle Trouble Window", opts = { silent = true, noremap = true } },
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
extensions = {
|
extensions = {
|
||||||
smart_splits = {},
|
smart_splits = {},
|
||||||
},
|
}
|
||||||
})
|
})
|
||||||
|
|
Reference in New Issue