updated deps
This commit is contained in:
parent
acd3a3e9fc
commit
8237620317
|
|
@ -10,19 +10,18 @@
|
||||||
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||||
"crates.nvim": { "branch": "main", "commit": "d1be10c1fcf4adb1eed2f2f510176db035efc68d" },
|
"crates.nvim": { "branch": "main", "commit": "cd670ecc862469557b12d12e7116d7afd2fd9c0f" },
|
||||||
"cspell.nvim": { "branch": "main", "commit": "508b64a23bd8f9473c59d083a92712486f6f138d" },
|
"cspell.nvim": { "branch": "main", "commit": "508b64a23bd8f9473c59d083a92712486f6f138d" },
|
||||||
"editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" },
|
"editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" },
|
||||||
"fastaction.nvim": { "branch": "master", "commit": "89c64a4906df97e766208640f6e80a96d5e4abb4" },
|
|
||||||
"fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
|
"fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
|
||||||
"formatter.nvim": { "branch": "master", "commit": "ad246d34ce7a32f752071ed81b09b94e6b127fad" },
|
"formatter.nvim": { "branch": "master", "commit": "ad246d34ce7a32f752071ed81b09b94e6b127fad" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" },
|
"gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
|
||||||
"heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
|
"heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
|
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
|
||||||
"lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" },
|
"lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" },
|
||||||
"lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" },
|
"lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" },
|
||||||
"lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
|
"lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" },
|
||||||
"mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
|
"mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||||
"mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
|
"mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
|
||||||
|
|
@ -33,18 +32,18 @@
|
||||||
"neotest-zig": { "branch": "main", "commit": "b3e6246c07d3d4f06075f33aea896affd25f0de9" },
|
"neotest-zig": { "branch": "main", "commit": "b3e6246c07d3d4f06075f33aea896affd25f0de9" },
|
||||||
"none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" },
|
"none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
|
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" },
|
"nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
|
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
|
"nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
|
"nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "fdc44768a09a65140aa00c92872a5381ad486485" },
|
"nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" },
|
||||||
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
|
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "65310b64eee19a6e74e1b6f607a9f46f751290fe" },
|
"nvim-treesitter": { "branch": "master", "commit": "db92f60ed0c50e747155d685e977b18327f20b3a" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" },
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" },
|
||||||
"nvim-vtsls": { "branch": "main", "commit": "45c6dfea9f83a126e9bfc5dd63430562b3f8af16" },
|
"nvim-vtsls": { "branch": "main", "commit": "45c6dfea9f83a126e9bfc5dd63430562b3f8af16" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" },
|
"nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
|
||||||
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
|
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
|
||||||
"omnisharp-vim": { "branch": "master", "commit": "f9c5d3e3375e8b5688a4506e813cb21bdc7329b1" },
|
"omnisharp-vim": { "branch": "master", "commit": "f9c5d3e3375e8b5688a4506e813cb21bdc7329b1" },
|
||||||
"packer.nvim": { "branch": "master", "commit": "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3" },
|
"packer.nvim": { "branch": "master", "commit": "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3" },
|
||||||
|
|
@ -57,8 +56,9 @@
|
||||||
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
||||||
"statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" },
|
"statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" },
|
||||||
"supermaven-nvim": { "branch": "main", "commit": "d71257f431e190d9236d7f30da4c2d659389e91f" },
|
"supermaven-nvim": { "branch": "main", "commit": "d71257f431e190d9236d7f30da4c2d659389e91f" },
|
||||||
|
"tailwind-tools.nvim": { "branch": "master", "commit": "48523580c6af449a7a57610ce5596c716cf4363a" },
|
||||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "10b8a82b042caf50b78e619d92caf0910211973d" },
|
"telescope.nvim": { "branch": "master", "commit": "68a6d8e8a0a8276ad56dc2a5bc29a4767a8eb5da" },
|
||||||
"template-string.nvim": { "branch": "main", "commit": "419bfb2e4d5f0e6ddd0d4435f85b69da0d88d524" },
|
"template-string.nvim": { "branch": "main", "commit": "419bfb2e4d5f0e6ddd0d4435f85b69da0d88d524" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" },
|
"todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" },
|
||||||
"typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" },
|
"typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" },
|
||||||
|
|
|
||||||
49
lua/keys.lua
49
lua/keys.lua
|
|
@ -43,43 +43,16 @@ vim.api.nvim_set_keymap("", "<A-Left>", "<C-w><Left>", {silent = true})
|
||||||
vim.api.nvim_set_keymap("", "<A-Up>", "<C-w><Up>", {silent = true})
|
vim.api.nvim_set_keymap("", "<A-Up>", "<C-w><Up>", {silent = true})
|
||||||
vim.api.nvim_set_keymap("", "<A-Down>", "<C-w><Down>", {silent = true})
|
vim.api.nvim_set_keymap("", "<A-Down>", "<C-w><Down>", {silent = true})
|
||||||
vim.api.nvim_set_keymap("", "<A-Right>", "<C-w><Right>", {silent = true})
|
vim.api.nvim_set_keymap("", "<A-Right>", "<C-w><Right>", {silent = true})
|
||||||
vim.api.nvim_set_keymap("", "<C-p>", "<C-i>", {silent = true})
|
vim.api.nvim_set_keymap("", "<C-p>", "<C-i>", {silent = true, noremap = true})
|
||||||
|
|
||||||
function _G.toggle_venn()
|
local insert_random_uuid = function()
|
||||||
local venn_enabled = vim.inspect(vim.b.venn_enabled)
|
local id, _ = vim.fn.system("uuidgen"):gsub("\n", ""):gsub("-", ""):upper()
|
||||||
if (venn_enabled == "nil") then
|
vim.api.nvim_put({id}, "c", true, true)
|
||||||
vim.b.venn_enabled = true
|
|
||||||
vim.cmd [[setlocal ve=all]]
|
|
||||||
-- draw a line on HJKL keystokes
|
|
||||||
vim.api.nvim_buf_set_keymap(0, "n", "J", "<C-v>j:VBox<cr>", {noremap = true})
|
|
||||||
vim.api.nvim_buf_set_keymap(0, "n", "K", "<C-v>k:VBox<cr>", {noremap = true})
|
|
||||||
vim.api.nvim_buf_set_keymap(0, "n", "L", "<C-v>l:VBox<cr>", {noremap = true})
|
|
||||||
vim.api.nvim_buf_set_keymap(0, "n", "H", "<C-v>h:VBox<cr>", {noremap = true})
|
|
||||||
-- draw a box by pressing "b" with visual selection
|
|
||||||
vim.api.nvim_buf_set_keymap(0, "v", "b", ":VBox<cr>", {noremap = true})
|
|
||||||
else
|
|
||||||
vim.cmd [[setlocal ve=]]
|
|
||||||
vim.cmd [[mapclear <buffer>]]
|
|
||||||
vim.b.venn_enabled = nil
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
-- toggle keymappings for venn using <leader>v
|
local insert_random_uuid_dashed = function()
|
||||||
vim.api.nvim_set_keymap("n", "<leader>v", ":lua toggle_venn()<cr>", {noremap = true})
|
local id, _ = vim.fn.system("uuidgen"):gsub("\n", ""):upper()
|
||||||
vim.api.nvim_set_keymap(
|
vim.api.nvim_put({id}, "c", true, true)
|
||||||
"v",
|
end
|
||||||
"<Leader>mc",
|
|
||||||
"<Cmd>lua require('nvim-magic.flows').append_completion(require('nvim-magic').backends.default)<CR>",
|
vim.keymap.set("n", "<leader>u", insert_random_uuid, {noremap = true, silent = true})
|
||||||
{}
|
vim.keymap.set("n", "<leader>U", insert_random_uuid_dashed, {noremap = true, silent = true})
|
||||||
)
|
|
||||||
vim.api.nvim_set_keymap(
|
|
||||||
"v",
|
|
||||||
"<Leader>ma",
|
|
||||||
"<Cmd>lua require('nvim-magic.flows').suggest_alteration(require('nvim-magic').backends.default)<CR>",
|
|
||||||
{}
|
|
||||||
)
|
|
||||||
vim.api.nvim_set_keymap(
|
|
||||||
"v",
|
|
||||||
"<Leader>md",
|
|
||||||
"<Cmd>lua require('nvim-magic.flows').suggest_docstring(require('nvim-magic').backends.default)<CR>",
|
|
||||||
{}
|
|
||||||
)
|
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ require("lazy").setup(
|
||||||
border = {}
|
border = {}
|
||||||
}
|
}
|
||||||
require("telescope").setup {
|
require("telescope").setup {
|
||||||
file_ignore_patterns = {"package-lock.json"},
|
file_ignore_patterns = {"package-lock.json", ".git/"},
|
||||||
extensions = {
|
extensions = {
|
||||||
["ui-select"] = {
|
["ui-select"] = {
|
||||||
require("telescope.themes").get_dropdown(dropdown_configs)
|
require("telescope.themes").get_dropdown(dropdown_configs)
|
||||||
|
|
@ -235,12 +235,12 @@ require("lazy").setup(
|
||||||
-- require("plugins/copilot")
|
-- require("plugins/copilot")
|
||||||
-- end
|
-- end
|
||||||
-- },
|
-- },
|
||||||
-- {
|
{
|
||||||
-- "supermaven-inc/supermaven-nvim",
|
"supermaven-inc/supermaven-nvim",
|
||||||
-- config = function()
|
config = function()
|
||||||
-- require("supermaven-nvim").setup({})
|
require("supermaven-nvim").setup({})
|
||||||
-- end
|
end
|
||||||
-- },
|
},
|
||||||
{
|
{
|
||||||
"ggandor/lightspeed.nvim",
|
"ggandor/lightspeed.nvim",
|
||||||
dependencies = {"tpope/vim-repeat"}
|
dependencies = {"tpope/vim-repeat"}
|
||||||
|
|
|
||||||
|
|
@ -176,7 +176,8 @@ end
|
||||||
local path = vim.uv.cwd()
|
local path = vim.uv.cwd()
|
||||||
local config_path = path .. "/.vscode/settings.json"
|
local config_path = path .. "/.vscode/settings.json"
|
||||||
local tailwindcss_settings = {}
|
local tailwindcss_settings = {}
|
||||||
if vim.uv.fs_stat(config_path) then
|
function patch_tailwindcss_settings()
|
||||||
|
if vim.uv.fs_stat(config_path) then
|
||||||
local file = vim.fn.readfile(config_path)
|
local file = vim.fn.readfile(config_path)
|
||||||
local vscode_settings = vim.fn.json_decode(file)
|
local vscode_settings = vim.fn.json_decode(file)
|
||||||
tailwindcss_settings =
|
tailwindcss_settings =
|
||||||
|
|
@ -189,7 +190,9 @@ if vim.uv.fs_stat(config_path) then
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
pcall(patch_tailwindcss_settings)
|
||||||
nvim_lsp.tailwindcss.setup {
|
nvim_lsp.tailwindcss.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = {
|
flags = {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,10 @@ require("neotest").setup(
|
||||||
adapters = {
|
adapters = {
|
||||||
require("neotest-jest")(
|
require("neotest-jest")(
|
||||||
{
|
{
|
||||||
jestCommand = "npx jest"
|
jestCommand = "npx jest --bail --ci",
|
||||||
|
env = {
|
||||||
|
NODE_OPTIONS = "--no-deprecation"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
require("neotest-zig")
|
require("neotest-zig")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue