This commit is contained in:
subcrip 2024-05-28 15:09:37 +08:00
parent 7b8abe0a97
commit 98a9b2ebf4
Signed by: subcrip
SSH Key Fingerprint: SHA256:dFPFi68d8C87YkFkEBU4TkcrYRySWpekRR1hbnDWUCw
5 changed files with 17 additions and 20 deletions

View File

@ -10,8 +10,10 @@
"better-escape.vim": { "branch": "master", "commit": "6b16a45a839727977277f6ab11bded63e9ed86bb" }, "better-escape.vim": { "branch": "master", "commit": "6b16a45a839727977277f6ab11bded63e9ed86bb" },
"cmake-tools.nvim": { "branch": "master", "commit": "d84e9ec2b71f18a39e8d8c4301796c77d64b80ef" }, "cmake-tools.nvim": { "branch": "master", "commit": "d84e9ec2b71f18a39e8d8c4301796c77d64b80ef" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
"cmp-nerdfont": { "branch": "main", "commit": "a3b7c0cadb7bd389f513eecda376d4c6bec90003" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },

View File

@ -29,6 +29,7 @@ vim.cmd("set foldlevelstart=99")
vim.cmd("set guicursor=i:ver25-blinkon500-blinkoff500,a:ver25-iCursor") vim.cmd("set guicursor=i:ver25-blinkon500-blinkoff500,a:ver25-iCursor")
vim.cmd("set list") vim.cmd("set list")
vim.cmd('set listchars="eol:↵,tab:→\\ ,trail=␣,precedes=«,extends=»"') vim.cmd('set listchars="eol:↵,tab:→\\ ,trail=␣,precedes=«,extends=»"')
vim.cmd("set noshowmode")
vim.diagnostic.config({ vim.diagnostic.config({
update_in_insert = true, update_in_insert = true,
float = { float = {
@ -113,6 +114,8 @@ local plugins = {
"L3MON4D3/LuaSnip", "L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip", "saadparwaiz1/cmp_luasnip",
"hrsh7th/cmp-emoji", "hrsh7th/cmp-emoji",
"chrisgrieser/cmp-nerdfont",
"hrsh7th/cmp-calc",
}, },
}, },
{ {
@ -495,6 +498,9 @@ cmp.setup({
{ name = "luasnip" }, -- snippets { name = "luasnip" }, -- snippets
{ name = "buffer" }, -- text within the current buffer { name = "buffer" }, -- text within the current buffer
{ name = "path" }, -- file system paths { name = "path" }, -- file system paths
{ name = "emoji" },
{ name = "nerdfont" },
{ name = "calc" },
}), }),
}) })
@ -592,8 +598,8 @@ vim.keymap.set("v", "<Tab>", ">gv")
vim.keymap.set("v", "<S-Tab>", "<gv") vim.keymap.set("v", "<S-Tab>", "<gv")
vim.keymap.set('n', '<leader>t', '<Cmd>TodoTelescope<CR>') vim.keymap.set('n', '<leader>t', '<Cmd>TodoTelescope<CR>')
vim.keymap.set('n', '<leader>m', '<Cmd>Tele marks<CR>') vim.keymap.set('n', '<leader>m', '<Cmd>Tele marks<CR>')
vim.keymap.set('v', "<C-S-Down>", "dpV`]") vim.keymap.set('v', "<C-S-j>", "dpV`]")
vim.keymap.set('v', "<C-S-Up>", "dkPV`]") vim.keymap.set('v', "<C-S-k>", "dkPV`]")
vim.keymap.set('n', '<C-p>', '<Cmd>Legendary<CR>', {noremap=true}) vim.keymap.set('n', '<C-p>', '<Cmd>Legendary<CR>', {noremap=true})
vim.keymap.set({'n', 'v', 'x'}, '<leader>h', '<Cmd>HopWord<CR>') vim.keymap.set({'n', 'v', 'x'}, '<leader>h', '<Cmd>HopWord<CR>')
vim.keymap.set('n', '<leader>dd', '<Cmd>TroubleToggle document_diagnostics<CR>'); vim.keymap.set('n', '<leader>dd', '<Cmd>TroubleToggle document_diagnostics<CR>');
@ -609,6 +615,7 @@ vim.keymap.set('n', '<S-U>', '<Cmd>Telescope undo<CR>', {noremap=true})
vim.keymap.set('n', '<C-CR>', 'i{<ESC>A}<ESC>%li<CR><ESC>$i<CR><ESC>k^', {noremap=true}) vim.keymap.set('n', '<C-CR>', 'i{<ESC>A}<ESC>%li<CR><ESC>$i<CR><ESC>k^', {noremap=true})
vim.keymap.set('n', '<C-BS>', 'd0i<BS><ESC>l', {noremap=true}) 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('i', '<C-BS>', '<C-u><BS>', {noremap=true})
vim.keymap.set('n', '<leader><leader>', '<Cmd>Telescope help_tags<CR>', {noremap=true})
vim.api.nvim_create_user_command('PopupSaveas', function() vim.api.nvim_create_user_command('PopupSaveas', function()
vim.ui.input({ prompt = 'Save As: ' }, function(input) vim.ui.input({ prompt = 'Save As: ' }, function(input)
@ -641,7 +648,7 @@ require("nvim-treesitter.configs").setup {
} }
vim.api.nvim_create_user_command('Backup', '!git add . && git commit -S -m "backup" && git push', {}) vim.api.nvim_create_user_command('Backup', '!git add . && git commit -S -m "backup" && git push', {})
vim.cmd('cabbrev backup Backup') vim.api.nvim_create_user_command('Config', 'Explore ~/.config/nvim', {})
require('Comment').setup() require('Comment').setup()
local str = require("cmp.utils.str") local str = require("cmp.utils.str")
@ -957,3 +964,4 @@ vim.api.nvim_create_autocmd("LspAttach", {
vim.lsp.inlay_hint.enable(true) vim.lsp.inlay_hint.enable(true)
end, end,
}) })

View File

@ -53,8 +53,8 @@ struct hash_vec {
} }
hash_vec(size_t maxn) { hash_vec(size_t maxn) {
clear(); clear();
MLL<MDL1> c1 = 1; MLL<MDL1> c1 = power1.size() ? power1.back() * b : 1;
MLL<MDL2> c2 = 1; MLL<MDL2> c2 = power2.size() ? power2.back() * b : 1;
for (int i = power1.size(); i < maxn; ++i) { for (int i = power1.size(); i < maxn; ++i) {
power1.push_back(c1); power1.push_back(c1);
power2.push_back(c2); power2.push_back(c2);

View File

@ -102,19 +102,6 @@ ls.add_snippets(nil, {
} }
}) })
local hash_deque = require('snippets.hash-deque')
ls.add_snippets(nil, {
cpp = {
snip({
trig = 'hash_deque',
namr = 'hash_deque',
dscr = 'Hashable Deque',
},{
text(lines(hash_deque))
})
}
})
local hash_vec = require('snippets.hash-vec') local hash_vec = require('snippets.hash-vec')
ls.add_snippets(nil, { ls.add_snippets(nil, {
cpp = { cpp = {

File diff suppressed because one or more lines are too long