fix: whichkey
This commit is contained in:
Matthew Leong
parent
cb845d1d66
commit
cc95c5013f
5 changed files with 38 additions and 123 deletions
|
|
@ -1,66 +1,21 @@
|
|||
{
|
||||
<<<<<<< Updated upstream
|
||||
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
|
||||
"LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
|
||||
"SchemaStore.nvim": { "branch": "main", "commit": "4d798fd5b692c8fce77268aba8f6f926b0c9f835" },
|
||||
"auto-session": { "branch": "main", "commit": "29a8c77a0579636d5520aebd38bdbc2e6079f2f5" },
|
||||
=======
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"LuaSnip": { "branch": "master", "commit": "ac7cbc0e85710db7cba6510b1d8e6a1a551444f7" },
|
||||
"SchemaStore.nvim": { "branch": "main", "commit": "3e54f4bbebea598646b141aa8aeca8a01b6ba601" },
|
||||
"auto-session": { "branch": "main", "commit": "3cd531ce4d46fb156268ddedf5f3e6822ef26af7" },
|
||||
>>>>>>> Stashed changes
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||
"cosmic-ui": { "branch": "main", "commit": "c0b14531999f2bfef3d927c4dcd57a1a8fed5ee9" },
|
||||
<<<<<<< Updated upstream
|
||||
"friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" },
|
||||
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
|
||||
"neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
|
||||
"noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
|
||||
"none-ls-extras.nvim": { "branch": "main", "commit": "c226aca7a506dd4325fb96188bffe804d24bbf18" },
|
||||
"none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "72e25ed4162474ef5d666525853f8a42bffd97c5" },
|
||||
"nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "797260ff31e8bdd9db0f0c352659a35aba335b0b" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "eb012f03bb3b4aca9e875d146008b923d0e07e65" },
|
||||
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "567a76780cd4f982dae1ec57e3dad6174bef3680" },
|
||||
"nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
|
||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" },
|
||||
"nx.nvim": { "branch": "main", "commit": "f8a3a21b3d540889401a40d1f2803083794c0372" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
|
||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "c816406bd50ade6ec754474f08974154487d417c" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "c025baf23b62f044eff1f4ef561c45de636f0e32" },
|
||||
"typescript-tools.nvim": { "branch": "master", "commit": "c43d9580c3ff5999a1eabca849f807ab33787ea7" },
|
||||
"vim-floaterm": { "branch": "master", "commit": "c0535d758004bcce016839e318cbbe802b92c469" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
|
||||
}
|
||||
=======
|
||||
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
|
||||
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
|
||||
"noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
|
||||
"none-ls-extras.nvim": { "branch": "main", "commit": "f2bb002c8aa644d1f253772ff5d4e75e45ff7f4f" },
|
||||
"none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
|
||||
|
|
@ -83,9 +38,7 @@
|
|||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "4867d10ead04e69872b24818d0d306539305cf87" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
|
||||
}
|
||||
>>>>>>> Stashed changes
|
||||
|
|
|
|||
|
|
@ -28,18 +28,19 @@ local default_config = {
|
|||
-- lsp servers that should be installed
|
||||
ensure_installed = {
|
||||
'astro',
|
||||
'eslint',
|
||||
'prettierd',
|
||||
'cssls',
|
||||
'eslint',
|
||||
'eslint',
|
||||
'gopls',
|
||||
'graphql',
|
||||
'html',
|
||||
'jsonls',
|
||||
'ts_ls',
|
||||
'lua_ls',
|
||||
'prettierd',
|
||||
'pyright',
|
||||
'svelte',
|
||||
'tailwindcss',
|
||||
'ts_ls',
|
||||
'yamlls',
|
||||
},
|
||||
-- lsp servers that should be enabled
|
||||
|
|
@ -56,13 +57,8 @@ local default_config = {
|
|||
},
|
||||
gopls = true,
|
||||
html = true,
|
||||
<<<<<<< Updated upstream
|
||||
tsserver = {
|
||||
format = false,
|
||||
=======
|
||||
ts_ls = {
|
||||
format_on_save = false,
|
||||
>>>>>>> Stashed changes
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ return {
|
|||
config = function()
|
||||
local gs = require('gitsigns')
|
||||
gs.setup(u.merge({
|
||||
signs = {
|
||||
add = { hl = 'GitSignsAdd', text = '│', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
|
||||
change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
|
||||
delete = { hl = 'GitSignsDelete', text = '_', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
|
||||
topdelete = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
|
||||
changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
|
||||
},
|
||||
--[[ signs = { ]]
|
||||
--[[ add = { hl = 'GitSignsAdd', text = '│', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' }, ]]
|
||||
--[[ change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' }, ]]
|
||||
--[[ delete = { hl = 'GitSignsDelete', text = '_', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' }, ]]
|
||||
--[[ topdelete = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' }, ]]
|
||||
--[[ changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' }, ]]
|
||||
--[[ }, ]]
|
||||
preview_config = {
|
||||
-- Options passed to nvim_open_win
|
||||
border = user_config.border,
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ return {
|
|||
config_opts.sources = u.merge_list({
|
||||
null_ls.builtins.code_actions.gitsigns,
|
||||
null_ls.builtins.diagnostics.markdownlint,
|
||||
require('none-ls.diagnostics.eslint_d'),
|
||||
require('none-ls.formatting.eslint_d'),
|
||||
require('none-ls.code_actions.eslint_d'),
|
||||
--[[ require('none-ls.diagnostics.eslint_d'), ]]
|
||||
--[[ require('none-ls.formatting.eslint_d'), ]]
|
||||
--[[ require('none-ls.code_actions.eslint_d'), ]]
|
||||
null_ls.builtins.formatting.prettierd.with({
|
||||
env = {
|
||||
PRETTIERD_LOCAL_PRETTIER_ONLY = 1,
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ return {
|
|||
config = function()
|
||||
local wk = require('which-key')
|
||||
wk.setup({
|
||||
window = {
|
||||
win = {
|
||||
border = user_config.border,
|
||||
position = 'bottom',
|
||||
margin = { 1, 0, 1, 0 },
|
||||
--[[ position = 'bottom', ]]
|
||||
--[[ margin = { 1, 0, 1, 0 }, ]]
|
||||
padding = { 3, 2, 3, 2 },
|
||||
winblend = 20,
|
||||
--[[ winblend = 20, ]]
|
||||
},
|
||||
layout = {
|
||||
height = { min = 4, max = 25 },
|
||||
|
|
@ -19,57 +19,23 @@ return {
|
|||
},
|
||||
})
|
||||
|
||||
wk.register({
|
||||
['<leader>'] = {
|
||||
b = {
|
||||
name = '+buffer',
|
||||
},
|
||||
c = {
|
||||
name = '+quickfix',
|
||||
},
|
||||
f = {
|
||||
name = '+find',
|
||||
},
|
||||
h = {
|
||||
name = '+gitsigns',
|
||||
t = {
|
||||
name = '+toggle',
|
||||
},
|
||||
},
|
||||
l = {
|
||||
name = '+lsp',
|
||||
d = {
|
||||
name = '+diagnostics',
|
||||
},
|
||||
t = {
|
||||
name = '+toggle',
|
||||
},
|
||||
w = {
|
||||
name = '+workspace',
|
||||
},
|
||||
},
|
||||
g = {
|
||||
name = '+goto',
|
||||
},
|
||||
n = {
|
||||
name = '+tree',
|
||||
},
|
||||
s = {
|
||||
name = '+session',
|
||||
},
|
||||
t = {
|
||||
name = '+tab',
|
||||
},
|
||||
p = {
|
||||
name = '+lazy (plugins)',
|
||||
},
|
||||
v = {
|
||||
name = '+git (vsc)',
|
||||
t = {
|
||||
name = '+toggle',
|
||||
},
|
||||
},
|
||||
},
|
||||
wk.add({
|
||||
{ '<leader>b', group = 'buffer' },
|
||||
{ '<leader>c', group = 'quickfix' },
|
||||
{ '<leader>f', group = 'find' },
|
||||
{ '<leader>g', group = 'goto' },
|
||||
{ '<leader>h', group = 'gitsigns' },
|
||||
{ '<leader>ht', group = 'toggle' },
|
||||
{ '<leader>l', group = 'lsp' },
|
||||
{ '<leader>ld', group = 'diagnostics' },
|
||||
{ '<leader>lt', group = 'toggle' },
|
||||
{ '<leader>lw', group = 'workspace' },
|
||||
{ '<leader>n', group = 'tree' },
|
||||
{ '<leader>p', group = 'lazy (plugins)' },
|
||||
{ '<leader>s', group = 'session' },
|
||||
{ '<leader>t', group = 'tab' },
|
||||
{ '<leader>v', group = 'git (vsc)' },
|
||||
{ '<leader>vt', group = 'toggle' },
|
||||
})
|
||||
end,
|
||||
event = 'VeryLazy',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue