This commit is contained in:
subcrip 2024-06-04 18:02:32 +08:00
parent 8d7111ee0f
commit 25da85c1a4
Signed by: subcrip
SSH Key Fingerprint: SHA256:dFPFi68d8C87YkFkEBU4TkcrYRySWpekRR1hbnDWUCw
3 changed files with 244 additions and 119 deletions

View File

@ -1,12 +1,14 @@
{
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
"LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
"LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" },
"NeoColumn.nvim": { "branch": "main", "commit": "db7695c7c70fcacd290712deef659bca464634ee" },
"arshamiser.nvim": { "branch": "dev", "commit": "53a73d60d426cb17860d4de169bce00ec3996c16" },
"arshlib.nvim": { "branch": "master", "commit": "111fd439268adda206a24b133096893869a50764" },
"auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" },
"barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
"barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
"better-escape.vim": { "branch": "master", "commit": "6b16a45a839727977277f6ab11bded63e9ed86bb" },
"cmake-tools.nvim": { "branch": "master", "commit": "131540d8015a63511904570e7205eefa49aa74a7" },
"cmake-tools.nvim": { "branch": "master", "commit": "8853f796b0173f34689dd07c8bd654b8fb3f1dc1" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
@ -16,46 +18,50 @@
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"codesnap.nvim": { "branch": "main", "commit": "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b" },
"cphelper.nvim": { "branch": "main", "commit": "ab259315496514d58b2021048ef40437ad0f5814" },
"diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
"dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" },
"dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
"eslint.nvim": { "branch": "main", "commit": "158f2289907d377018752fcfe0d61b746dc11767" },
"feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" },
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
"fzf-lua": { "branch": "main", "commit": "b92220ec838c195eb1c711daa69c905b1d7b8d8c" },
"git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" },
"git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" },
"gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" },
"goto-preview": { "branch": "main", "commit": "3552fad4a0244ffd9ac86508e29ccc5166f19eb8" },
"heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
"hlargs.nvim": { "branch": "main", "commit": "30fe1b3de2b7614f061be4fc9c71984a2b87e50a" },
"hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" },
"image.nvim": { "branch": "master", "commit": "645f997d171ea3d2505986a0519755600a26f02f" },
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
"lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" },
"legendary.nvim": { "branch": "master", "commit": "c1345db98e4c6e6e80d528384f3b5acbcb90bc40" },
"lsp_signature.nvim": { "branch": "master", "commit": "529e8861d0410389f0163a5e5c2199d4a4ef5bf6" },
"lazy.nvim": { "branch": "main", "commit": "ebbf84eb23d796ffd92ad88b980d3cf89921add4" },
"lazydev.nvim": { "branch": "main", "commit": "ddab2f1d901dc0c5c4f721da94c604cc1a86b5dc" },
"legendary.nvim": { "branch": "master", "commit": "ed71afddfbe70493cbbc6a51ec3433840913a3e2" },
"listish.nvim": { "branch": "master", "commit": "3bc4bb02036f3802c6428c6232633d3192ac3604" },
"lsp_signature.nvim": { "branch": "master", "commit": "2ec2ba23882329c1302dff773b0d3620371d634f" },
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"marks.nvim": { "branch": "master", "commit": "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
"mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
"melange-nvim": { "branch": "master", "commit": "800490ee87ce3e1b4afe751ff81f2864cb01937d" },
"modicator.nvim": { "branch": "main", "commit": "780ea1e98c9bee8f3816685213b0aac42b34cd75" },
"monokai": { "branch": "master", "commit": "2bad2a92fe0ff6c8581d33a853a1b17592b83239" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
"neodev.nvim": { "branch": "main", "commit": "56268d602feaf4fb5131f7d49c0334b4863b0470" },
"neogit": { "branch": "master", "commit": "9da48298a1c1e1ea52b4b9b9a4c2c4ded6ac422a" },
"nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
"neogit": { "branch": "master", "commit": "3d58bf1d548f6fafdaab8ce4d75e25c438aee92c" },
"nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
"null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
"nvim-lspconfig": { "branch": "master", "commit": "38de86f82efd9ba0881203767d6a8e1815abca28" },
"nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-neoclip.lua": { "branch": "main", "commit": "9b02a625dfa22499089458554be86171a1dfe8b1" },
"nvim-neoclip.lua": { "branch": "main", "commit": "709c97fabec9da7d04f7d2f5e207423af8c02871" },
"nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
"nvim-numbertoggle": { "branch": "main", "commit": "c5827153f8a955886f1b38eaea6998c067d2992f" },
"nvim-surround": { "branch": "main", "commit": "03d3972f15ee4acbc997873202cbd6cb7e50b230" },
"nvim-treesitter": { "branch": "master", "commit": "b91ae14fc3bb801c7ea69bc283fe860b32b5163d" },
"nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" },
"nvim-origami": { "branch": "main", "commit": "fd3036a2235d188dce43274fed8392795a0cd392" },
"nvim-surround": { "branch": "main", "commit": "f1f0699a1d49f28e607ffa4361f1bbe757ac5ebc" },
"nvim-treesitter": { "branch": "master", "commit": "a80fe081b4c5890980561e0de2458f64aaffbfc7" },
"nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" },
"nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
"outline.nvim": { "branch": "main", "commit": "6a91568110684ac056e62e3b2d7409d7c8b2e5e1" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
@ -63,15 +69,16 @@
"search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
"smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" },
"sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
"sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
"telescope-git-file-history.nvim": { "branch": "master", "commit": "f94fab1d5a51fa28dd95b1a6bd377505dc1a8e82" },
"telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" },
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
"todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" },
"trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
"todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" },
"trouble.nvim": { "branch": "main", "commit": "915179759c9459b69faae90a38da6fc1ca6b90d7" },
"twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
"usage-tracker.nvim": { "branch": "main", "commit": "739532b069e0d829b45ede989c657ac32a2141a6" },
"ultimate-autopair.nvim": { "branch": "v0.6", "commit": "813e1b3391c3f50100345bf3956c618f7e522e74" },
"vim-cursorword": { "branch": "master", "commit": "34852083276c1fd9ff4cccaf052111e7d5a2472e" },
"vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
"vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" },
@ -79,5 +86,5 @@
"vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" },
"vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
"vim-wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
"which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" }
}

View File

@ -59,7 +59,6 @@ vim.opt.rtp:prepend(lazypath)
local plugins = {
{ 'nvim-lua/plenary.nvim' },
{ 'rcarriga/nvim-notify' },
{"loctvl842/monokai-pro.nvim", name="monokai", priority=1000},
{
'nvim-telescope/telescope.nvim', tag = '0.1.5',
dependencies = {
@ -76,7 +75,7 @@ local plugins = {
dependencies = {
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim",
"3rd/image.nvim"
"3rd/image.nvim",
}
},
{
@ -89,7 +88,7 @@ local plugins = {
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
{ 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
-- Additional lua configuration, makes nvim stuff amazing!
'folke/neodev.nvim',
-- 'folke/neodev.nvim',
},
opts = {
inlay_hints = { enabled = true, },
@ -131,7 +130,7 @@ local plugins = {
version = '^1.0.0', -- optional: only update when a new 1.x version is released
},
{
"ray-x/lsp_signature.nvim",
"ray-x/lsp_signature.nvim", -- Show signature on `K` stroke
event = "VeryLazy",
opts = {},
config = function(_, opts) require'lsp_signature'.setup(opts) end
@ -149,7 +148,9 @@ local plugins = {
-- refer to the configuration section below
}
},
{ 'jdhao/better-escape.vim' },
{
'jdhao/better-escape.vim' -- `jk` without causing `j` to have delay
},
{
'Pocco81/auto-save.nvim',
opts = {
@ -162,16 +163,13 @@ local plugins = {
opts = {}
},
{
"dhruvasagar/vim-prosession",
"dhruvasagar/vim-prosession", -- save sessions
dependencies = {
"tpope/vim-obsession",
},
},
-- {
-- "EdenEast/nightfox.nvim",
-- },
{
"arielherself/arshamiser.nvim",
"arielherself/arshamiser.nvim", -- status bar
branch = "dev",
dependencies = {
"arsham/arshlib.nvim",
@ -198,13 +196,15 @@ local plugins = {
end,
},
{
'numToStr/Comment.nvim',
'numToStr/Comment.nvim', -- `gc` for commenting
opts = {
-- add any options here
},
lazy = false,
},
{ 'onsails/lspkind.nvim' },
{
'onsails/lspkind.nvim' -- icon in completion menu
},
{
'MunifTanjim/eslint.nvim',
dependencies = {
@ -217,7 +217,9 @@ local plugins = {
'jose-elias-alvarez/null-ls.nvim'
}
},
{ 'hedyhli/outline.nvim' },
{
'hedyhli/outline.nvim' -- Show symbol outline on `<leader>s`
},
{
"folke/todo-comments.nvim",
opts = {
@ -227,16 +229,22 @@ local plugins = {
}
},
{ 'nvim-treesitter/nvim-treesitter-context' },
{ 'nvim-treesitter/nvim-treesitter-refactor' },
{ 'nvim-treesitter/nvim-treesitter-textobjects' },
{ 'mg979/vim-visual-multi' },
{ 'sindrets/diffview.nvim' },
{ 'sitiom/nvim-numbertoggle' },
{ 'mawkler/modicator.nvim' },
{
"ecthelionvi/NeoColumn.nvim",
'sitiom/nvim-numbertoggle' -- Automatically switch between relative and absolute line number
},
{
'mawkler/modicator.nvim' -- highlight current line number
},
{
"ecthelionvi/NeoColumn.nvim", -- highlight overflow columns?
opts = {}
},
{
"utilyre/barbecue.nvim",
"utilyre/barbecue.nvim", -- LSP winbar
name = "barbecue",
version = "*",
dependencies = {
@ -247,7 +255,11 @@ local plugins = {
-- configurations go here
},
},
{'akinsho/git-conflict.nvim', version = "*", config = true },
{
'akinsho/git-conflict.nvim', -- `GitConflictChooseOurs`
version = "*",
config = true,
},
{
'mrjones2014/legendary.nvim',
-- since legendary.nvim handles all your keymaps/commands,
@ -258,11 +270,11 @@ local plugins = {
-- dependencies = { 'kkharji/sqlite.lua' }
},
{
'stevearc/dressing.nvim',
'stevearc/dressing.nvim', -- better UI
opts = {},
},
{
"folke/twilight.nvim",
"folke/twilight.nvim", -- Focus on parts that's being edited
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
@ -272,8 +284,9 @@ local plugins = {
{ "lukas-reineke/indent-blankline.nvim", main = "ibl", opts = {} },
{ 'arielherself/vim-cursorword' },
{ 'm-demare/hlargs.nvim' },
{ 'chentoast/marks.nvim' },
{ 'gaborvecsei/usage-tracker.nvim' },
{
'chentoast/marks.nvim' -- Visualize marks
},
{ 'wakatime/vim-wakatime', lazy = false },
{
'smoka7/hop.nvim',
@ -281,7 +294,7 @@ local plugins = {
opts = {},
},
{
"kylechui/nvim-surround",
"kylechui/nvim-surround", -- `ysiw)`
version = "*", -- Use for stability; omit to use `main` branch for the latest features
event = "VeryLazy",
config = function()
@ -291,7 +304,7 @@ local plugins = {
end
},
{
"folke/trouble.nvim",
"folke/trouble.nvim", -- TroubleToggle
dependencies = { "nvim-tree/nvim-web-devicons" },
opts = {
-- your configuration comes here
@ -300,12 +313,10 @@ local plugins = {
},
},
{ 'Civitasv/cmake-tools.nvim' },
{ 'p00f/cphelper.nvim' },
-- { dir = '/home/user/Documents/melange-nvim' },
{ "arielherself/melange-nvim" },
{ 'hrsh7th/vim-vsnip' },
{
"NeogitOrg/neogit",
"NeogitOrg/neogit", -- <C-g>
dependencies = {
"sindrets/diffview.nvim", -- optional - Diff integration
@ -316,20 +327,37 @@ local plugins = {
config = true
},
-- { 'Exafunction/codeium.vim' },
{ "mistricky/codesnap.nvim", build = "make" },
{
"mistricky/codesnap.nvim", -- code snapshot
build = "make"
},
{ 'rmagatti/goto-preview' },
{
"FabianWirth/search.nvim",
"FabianWirth/search.nvim", -- Add tabs to Telescope search
dependencies = { "nvim-telescope/telescope.nvim" }
},
{ 'NvChad/nvim-colorizer.lua' },
{ 'debugloop/telescope-undo.nvim' },
{ "arielherself/neodev.nvim", opts = {} },
{
"AckslD/nvim-neoclip.lua",
'NvChad/nvim-colorizer.lua' -- Color green
},
{ 'debugloop/telescope-undo.nvim' },
{
"folke/lazydev.nvim", -- Autocompletion when editing Neovim configs or developing plugins
ft = "lua", -- only load on lua files
opts = {
library = {
-- vim.env.LAZY .. "/luvit-meta/library", -- see below
-- You can also add plugins you always want to have loaded.
-- Useful if the plugin has globals or types you want to use
-- vim.env.LAZY .. "/LazyVim", -- see below
},
},
},
{ "Bilal2453/luvit-meta", lazy = true },
{
"AckslD/nvim-neoclip.lua", -- `<leader>p`
},
{
"danielfalk/smart-open.nvim",
"danielfalk/smart-open.nvim", -- sort file search results by frequency
branch = "0.2.x",
config = function()
require("telescope").load_extension("smart_open")
@ -342,59 +370,39 @@ local plugins = {
{ "nvim-telescope/telescope-fzy-native.nvim" },
},
},
{
"chrisgrieser/nvim-origami", -- Fold keymap
event = "BufReadPost", -- later or on keypress would prevent saving folds
opts = true, -- needed even when using default config
},
{
'altermo/ultimate-autopair.nvim',
event={'InsertEnter','CmdlineEnter'},
branch='v0.6', --recommended as each new version will have breaking changes
opts={
--Config goes here
bs = {
single_delete = true,
},
cr = {
autoclose = true,
},
close = {
enable = false,
},
tabout = {
enable = true,
map = '<M-Tab>',
hopout = true,
}
},
},
}
require("lazy").setup(plugins, {})
vim.notify = require("notify")
require("monokai-pro").setup({
transparent_background = true,
terminal_colors = true,
devicons = true, -- highlight the icons of `nvim-web-devicons`
styles = {
comment = { italic = true },
keyword = { italic = false }, -- any other keyword
type = { italic = false }, -- (preferred) int, long, char, etc
storageclass = { italic = false }, -- static, register, volatile, etc
structure = { italic = false }, -- struct, union, enum, etc
parameter = { italic = false }, -- parameter pass in function
annotation = { italic = false },
tag_attribute = { italic = false }, -- attribute of tag in reactjs
},
filter = "spectrum", -- classic | octagon | pro | machine | ristretto | spectrum
-- Enable this will disable filter option
day_night = {
enable = false, -- turn off by default
day_filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum
night_filter = "spectrum", -- classic | octagon | pro | machine | ristretto | spectrum
},
inc_search = "background", -- underline | background
background_clear = {
-- "float_win",
"toggleterm",
-- "telescope",
-- "which-key",
"renamer",
"notify",
-- "nvim-tree",
-- "neo-tree",
-- "bufferline", -- better used if background of `neo-tree` or `nvim-tree` is cleared
},-- "float_win", "toggleterm", "telescope", "which-key", "renamer", "neo-tree", "nvim-tree", "bufferline"
plugins = {
bufferline = {
underline_selected = false,
underline_visible = false,
},
indent_blankline = {
context_highlight = "default", -- default | pro
context_start_underline = false,
},
},
})
-- vim.cmd([[colorscheme monokai-pro]])
vim.cmd([[colorscheme melange]])
-- vim.cmd.colorscheme("duskfox")
local builtin = require("telescope.builtin")
require('search').setup {
@ -548,6 +556,7 @@ lspconfig.rust_analyzer.setup {
lspconfig.lua_ls.setup {
capabilities = capabilities
}
lspconfig.marksman.setup {}
local lspconfutil = require 'lspconfig/util'
local root_pattern = lspconfutil.root_pattern("veridian.yml", ".git")
@ -632,6 +641,16 @@ vim.keymap.set('n', '<C-BS>', 'd0i<BS><ESC>l', {noremap=true})
vim.keymap.set('i', '<C-BS>', '<C-u><BS>', {noremap=true})
vim.keymap.set('n', '<leader><leader>', '<Cmd>Telescope help_tags<CR>', {noremap=true})
vim.keymap.set('n', '<leader>p', '<Cmd>Telescope neoclip a extra=plus,unnamedplus<CR>', {noremap=true})
-- vim.keymap.set('n', )
vim.api.nvim_create_user_command('SearchInCurrentFile', function()
vim.ui.input({ prompt = 'Grep > '}, function(input)
if input ~= nil then
vim.cmd('vimgrep /' .. input .. '/j %')
vim.cmd('horizontal copen')
end
end)
end, {})
vim.api.nvim_create_user_command('PopupSaveas', function()
vim.ui.input({ prompt = 'Save As: ' }, function(input)
@ -651,7 +670,8 @@ vim.api.nvim_create_user_command('PopupSaveas', function()
else
print('Save As cancelled')
end
end)end, {})
end)
end, {})
require("nvim-treesitter.configs").setup {
incremental_selection = {
@ -661,7 +681,117 @@ require("nvim-treesitter.configs").setup {
node_decremental = "V",
},
},
refactor = {
smart_rename = {
enable = true,
keymaps = { smart_rename = "grr" },
},
},
textobjects = {
select = {
enable = true,
lookahead = false,
keymaps = {
-- You can use the capture groups defined in textobjects.scm
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
-- You can optionally set descriptions to the mappings (used in the desc parameter of
-- nvim_buf_set_keymap) which plugins like which-key display
["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
-- You can also use captures from other query groups like `locals.scm`
["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" },
},
-- You can choose the select mode (default is charwise 'v')
--
-- Can also be a function which gets passed a table with the keys
-- * query_string: eg '@function.inner'
-- * method: eg 'v' or 'o'
-- and should return the mode ('v', 'V', or '<c-v>') or a table
-- mapping query_strings to modes.
selection_modes = {
['@parameter.outer'] = 'v', -- charwise
['@function.outer'] = 'V', -- linewise
['@class.outer'] = '<c-v>', -- blockwise
},
-- If you set this to `true` (default is `false`) then any textobject is
-- extended to include preceding or succeeding whitespace. Succeeding
-- whitespace has priority in order to act similarly to eg the built-in
-- `ap`.
--
-- Can also be a function which gets passed a table with the keys
-- * query_string: eg '@function.inner'
-- * selection_mode: eg 'v'
-- and should return true or false
include_surrounding_whitespace = false,
},
swap = {
enable = true,
swap_next = {
["]]"] = "@parameter.inner",
},
swap_previous = {
["[["] = "@parameter.inner",
},
},
move = {
enable = true,
set_jumps = true, -- whether to set jumps in the jumplist
goto_next_start = {
["]m"] = "@function.outer",
["]c"] = { query = "@class.outer", desc = "Next class start" },
--
-- You can use regex matching (i.e. lua pattern) and/or pass a list in a "query" key to group multiple queires.
["]o"] = "@loop.*",
-- ["]o"] = { query = { "@loop.inner", "@loop.outer" } }
--
-- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
-- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
},
goto_next_end = {
["]M"] = "@function.outer",
["]C"] = "@class.outer",
},
goto_previous_start = {
["[m"] = "@function.outer",
["[c"] = "@class.outer",
},
goto_previous_end = {
["[M"] = "@function.outer",
["[C"] = "@class.outer",
},
-- Below will go to either the start or the end, whichever is closer.
-- Use if you want more granular movements
-- Make it even more gradual by adding multiple queries and regex.
goto_next = {
["]d"] = "@conditional.outer",
},
goto_previous = {
["[d"] = "@conditional.outer",
}
},
}
}
local ts_repeat_move = require "nvim-treesitter.textobjects.repeatable_move"
-- Repeat movement with ; and ,
-- ensure ; goes forward and , goes backward regardless of the last direction
vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat_move.repeat_last_move_next)
vim.keymap.set({ "n", "x", "o" }, ",", ts_repeat_move.repeat_last_move_previous)
-- vim way: ; goes to the direction you were moving.
-- vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat_move.repeat_last_move)
-- vim.keymap.set({ "n", "x", "o" }, ",", ts_repeat_move.repeat_last_move_opposite)
-- Optionally, make builtin f, F, t, T also repeatable with ; and ,
vim.keymap.set({ "n", "x", "o" }, "f", ts_repeat_move.builtin_f_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "F", ts_repeat_move.builtin_F_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "t", ts_repeat_move.builtin_t_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "T", ts_repeat_move.builtin_T_expr, { expr = true })
vim.api.nvim_create_user_command('Backup', '!git add . && git commit -S -m "backup" && git push', {})
vim.api.nvim_create_user_command('Config', 'Explore ~/.config/nvim', {})
@ -806,17 +936,6 @@ require('hlargs').setup()
require('marks').setup()
require('usage-tracker').setup({
keep_eventlog_days = 31,
cleanup_freq_days = 7,
event_wait_period_in_sec = 5,
inactivity_threshold_in_min = 5,
inactivity_check_freq_in_sec = 5,
verbose = 0,
telemetry_endpoint = "" -- you'll need to start the restapi for this feature
})
-- my snippets
require('snippets')
@ -824,8 +943,8 @@ require('neo-tree').setup {
filesystem = {
filtered_items = {
visible = true, -- This is what you want: If you set this to `true`, all "hide" just mean "dimmed out"
hide_dotfiles = false,
hide_gitignored = false,
hide_dotfiles = true,
hide_gitignored = true,
},
}
}
@ -982,4 +1101,3 @@ vim.api.nvim_create_autocmd("LspAttach", {
})
require('neoclip').setup {}

File diff suppressed because one or more lines are too long