Compare commits

..

5 Commits

Author SHA1 Message Date
86d3fa1fb6
build(nix): update flake.lock
All checks were successful
Check Formatting of Files / Check-Formatting (push) Successful in 1m17s
2024-05-09 22:42:58 -05:00
1df66d71fa
refactor(nvim): correctly lazy load visual-whitespace.nvim 2024-05-09 22:42:42 -05:00
ce3aea72be
refactor(nvim): remove useless treesitter plugins 2024-05-09 22:42:20 -05:00
73ee308ac8
refactor(nvim): use builtin :h commenting for comments 2024-05-09 22:41:06 -05:00
6d4ec7861d
chore(nvim): update lazy lock 2024-05-09 21:40:45 -05:00
6 changed files with 54 additions and 113 deletions

90
flake.lock generated
View File

@ -72,11 +72,11 @@
"bob": { "bob": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713374776, "lastModified": 1715250924,
"narHash": "sha256-jVRxvhUENyucRHN4TGV9xsWOs7mfPJCV90Lk/hD1xFE=", "narHash": "sha256-lG5QbaYaUaZw4vxivk3143sGEg8MhT+YC8SB08O73wQ=",
"owner": "MordechaiHadad", "owner": "MordechaiHadad",
"repo": "bob", "repo": "bob",
"rev": "e65ef1bfbcb846b12cc639a25f193c2ea9c72b12", "rev": "f9c022be3b27f5196df6353ea0c9cb935d7b4186",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714612856, "lastModified": 1715217706,
"narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=", "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d57058eb09dd5ec00c746df34fe0a603ea744370", "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +178,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1714842256, "lastModified": 1715305668,
"narHash": "sha256-q8oPSGCj1H1BLZg4a06lGrmNsgq1WkPMCIuMhAtCxu8=", "narHash": "sha256-kOZzP9qLA+wvHp53qGNfqjF9qZe7R/bVDrIzWmRNn5M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "146fe1e340847eeee5243f77af634d9d1b990c8e", "rev": "248d81eeb6153e7fe12f279f850b423b857516cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -459,34 +459,34 @@
"freetype2": { "freetype2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1675923892, "lastModified": 1687587065,
"narHash": "sha256-dOm8VKYdclTLLkqWMLv7DQI0Qyjit7S4SOCszKEkG3o=", "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=",
"owner": "wez", "owner": "wez",
"repo": "freetype2", "repo": "freetype2",
"rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11", "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "wez", "owner": "wez",
"repo": "freetype2", "repo": "freetype2",
"rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11", "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
"type": "github" "type": "github"
} }
}, },
"harfbuzz": { "harfbuzz": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1677798343, "lastModified": 1711722720,
"narHash": "sha256-Lsd0Vrkrv67CMyV0ZveShfjUvqh/jDhI8rAK9ps+SZQ=", "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=",
"owner": "harfbuzz", "owner": "harfbuzz",
"repo": "harfbuzz", "repo": "harfbuzz",
"rev": "60841e26187576bff477c1a09ee2ffe544844abc", "rev": "63973005bc07aba599b47fdd4cf788647b601ccd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "harfbuzz", "owner": "harfbuzz",
"ref": "8.4.0",
"repo": "harfbuzz", "repo": "harfbuzz",
"rev": "60841e26187576bff477c1a09ee2ffe544844abc",
"type": "github" "type": "github"
} }
}, },
@ -541,11 +541,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714679908, "lastModified": 1715077503,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -612,11 +612,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1714754042, "lastModified": 1715292729,
"narHash": "sha256-UcnoAT91ewoikYFeJb1S3p4rVS0tfV7/juhrDkS6kvU=", "narHash": "sha256-Ml5HzPmVx/fnLedNpBYQs3YG2zhSKsPga89yaCDVYlM=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "3a8265266e0c0fe31f34b7c0192e8ae7d83ae950", "rev": "ca735c7554701a1191e6afdac2ea4b4f94ba6d88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -635,11 +635,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1714780994, "lastModified": 1715299512,
"narHash": "sha256-Qfc+wUSIx2IGTjFiYYk3kq58Cxr88WcBWtly8qN7BGA=", "narHash": "sha256-IYOsXQt04EIHfNhjwbDhSY/n3vQGhSiL/XHuMGnZnek=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "25d2ee5f16920301f53e22f606b34d4a90e10d65", "rev": "2b11e4433355b57784dd002d34cf810874fa044d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -658,11 +658,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1714701944, "lastModified": 1715275776,
"narHash": "sha256-trTxWfGElp0rkjquqG5I5RYVoxo8foCflxJFUtHwnOQ=", "narHash": "sha256-14zdPahOiwfkzhJ7/O0A5xSpmw48pKGhbmD3e/xnMPc=",
"owner": "nixos", "owner": "nixos",
"repo": "nix", "repo": "nix",
"rev": "00ca2b05b8fbbef09be5d1e4820857605d4c31b6", "rev": "de8c3c034cfa265bb6bbdae2cb1e01ecf5bc07e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -724,11 +724,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1714685007, "lastModified": 1715106579,
"narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", "narHash": "sha256-gZMgKEGiK6YrwGBiccZ1gemiUwjsZ1Zv49KYOgmX2fY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", "rev": "8be0d8a1ed4f96d99b09aa616e2afd47acc3da89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,11 +740,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1714656196, "lastModified": 1715037484,
"narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "94035b482d181af0a0f8f77823a790b256b7c3cc", "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,11 +787,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1714635257, "lastModified": 1715087517,
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1048,11 +1048,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714718861, "lastModified": 1715070592,
"narHash": "sha256-mCQdrn0Y3oOVZP/CileWAhuBX6aARBNrfxyqJBB4NxA=", "narHash": "sha256-PY6Vh9mOYjBC1wrWohIPw9eh1dDrDG9uBsZJjwRzGpI=",
"owner": "Alexays", "owner": "Alexays",
"repo": "Waybar", "repo": "Waybar",
"rev": "231d6972d7a023e9358ab7deda509baac49006cb", "rev": "2ead1bbf84ff0fdb7234b1d9332c3b3a3bb8b799",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1075,11 +1075,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1714411698, "lastModified": 1715298486,
"narHash": "sha256-dut0b9FueToW3WGh3mPh+wfV88ZjTx+r8be3w9HZhAU=", "narHash": "sha256-shhwuu9vpTo/Gk+fS7pk3lC81J76bIc3qVFfz/RBD+k=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "0184e88e97b6521df613df4ccdb2e896ce8b0ad0", "rev": "814857cd69ca9592381c72a48a3c685c4aafcd15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1101,8 +1101,8 @@
}, },
"original": { "original": {
"owner": "madler", "owner": "madler",
"ref": "v1.2.11",
"repo": "zlib", "repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github" "type": "github"
} }
} }

View File

@ -32,7 +32,7 @@
"fuzzy.nvim": { "branch": "master", "commit": "67a42ad2fa6d5ff41f0ef3cf69bb247410da5d7a" }, "fuzzy.nvim": { "branch": "master", "commit": "67a42ad2fa6d5ff41f0ef3cf69bb247410da5d7a" },
"gitlinker.nvim": { "branch": "master", "commit": "542f51784f20107ef9ecdadc47825204837efed5" }, "gitlinker.nvim": { "branch": "master", "commit": "542f51784f20107ef9ecdadc47825204837efed5" },
"gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
"go.nvim": { "branch": "master", "commit": "d5e2b8cdd84afdb0c49c42a6e8972acc645e0283" }, "go.nvim": { "branch": "master", "commit": "4348ba67c29338af648ed9a0455bebb44fdb3ef3" },
"guihua.lua": { "branch": "master", "commit": "5204646be15997ed101631d75df02512ecd6c2bb" }, "guihua.lua": { "branch": "master", "commit": "5204646be15997ed101631d75df02512ecd6c2bb" },
"gx.nvim": { "branch": "main", "commit": "cf6ed6ba86ffe4e3f51a898c03a05023b7a2fe48" }, "gx.nvim": { "branch": "main", "commit": "cf6ed6ba86ffe4e3f51a898c03a05023b7a2fe48" },
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
@ -60,14 +60,14 @@
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
"neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" },
"neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" }, "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" },
"neogit": { "branch": "nightly", "commit": "db029ae8ae709f9eabdcd348416455fd0900d33c" }, "neogit": { "branch": "nightly", "commit": "b8ace31783425df144e393e98480bf0aa62017e2" },
"neotest": { "branch": "master", "commit": "5caac5cc235d495a2382bc2980630ef36ac87032" }, "neotest": { "branch": "master", "commit": "5caac5cc235d495a2382bc2980630ef36ac87032" },
"neotest-go": { "branch": "main", "commit": "27c80deab9cf5cb30b20ee407b3a6c7285518128" }, "neotest-go": { "branch": "main", "commit": "27c80deab9cf5cb30b20ee407b3a6c7285518128" },
"neotest-plenary": { "branch": "master", "commit": "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584" }, "neotest-plenary": { "branch": "master", "commit": "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584" },
"netman.nvim": { "branch": "main", "commit": "68eecb29d913d4f35efa9bd0e8636046f70f998f" }, "netman.nvim": { "branch": "main", "commit": "68eecb29d913d4f35efa9bd0e8636046f70f998f" },
"nibbler": { "branch": "main", "commit": "a69331d6af60dda6ae6459522134a5e365fb43b1" }, "nibbler": { "branch": "main", "commit": "a69331d6af60dda6ae6459522134a5e365fb43b1" },
"no-neck-pain.nvim": { "branch": "main", "commit": "34625be12649666b7ccb08761087cc97bb788552" }, "no-neck-pain.nvim": { "branch": "main", "commit": "0b3299675e0100cceebfbee06a519bc688ec9df3" },
"noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" }, "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" },
"none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" }, "none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" },
"nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" },
"nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" },
@ -86,9 +86,9 @@
"nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" }, "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-surround": { "branch": "main", "commit": "6d0dc3dbb557bcc6a024969da461df4ba803fc48" }, "nvim-surround": { "branch": "main", "commit": "6d0dc3dbb557bcc6a024969da461df4ba803fc48" },
"nvim-treesitter": { "branch": "master", "commit": "1be5aa99e3e0e4a36c31fa7066dcf46a4e0142dd" }, "nvim-treesitter": { "branch": "master", "commit": "707b0dcf7641fa3a2aaad5053b215503f54f89aa" },
"nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" },
"nvim-ts-autotag": { "branch": "fix/close-xml-tags", "commit": "79884fb3b33828cb39c51b9a8bab0b28b9d060a3" }, "nvim-ts-autotag": { "branch": "fix/close-xml-tags", "commit": "79884fb3b33828cb39c51b9a8bab0b28b9d060a3" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
"nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },

View File

@ -121,8 +121,8 @@ M.setup = function()
vim.keymap.set("n", "<Tab>", "za", { silent = true, desc = "Toggle Fold" }) vim.keymap.set("n", "<Tab>", "za", { silent = true, desc = "Toggle Fold" })
-- Alias <leader>/ to toggle comments -- Alias <leader>/ to toggle comments
vim.keymap.set("n", "<leader>/", "gcc", { silent = true, desc = "Comment: Toggle Line" }) vim.keymap.set("n", "<leader>/", "gcc", { silent = true, remap = true, desc = "Comment: Toggle Line" })
vim.keymap.set("v", "<leader>/", "gc", { silent = true, desc = "Comment: Toggle Selection" }) vim.keymap.set("v", "<leader>/", "gc", { silent = true, remap = true, desc = "Comment: Toggle Selection" })
end end
return M return M

View File

@ -1,51 +0,0 @@
return {
{
"numToStr/Comment.nvim",
config = function()
require("Comment").setup({
pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
})
end,
dependencies = {
{
"JoosepAlviste/nvim-ts-context-commentstring",
opts = function()
vim.g.skip_ts_context_commentstring_module = true
end,
config = function()
require("ts_context_commentstring").setup({
enable_autocmd = false,
})
end,
},
},
keys = {
{ "gc", desc = "> Comment: Line" },
{ "gb", desc = "> Comment: Block " },
{ "gbc", desc = "Comment: Toggle block comment" },
{ "gcc", desc = "Comment: Toggle line comment" },
{ "gcO", desc = "Comment: Add comment on line above" },
{ "gco", desc = "Comment: Add comment on line below" },
{ "gcA", desc = "Comment: Add comment at end of line" },
{
"<leader>/",
function()
local api = require("Comment.api")
api.toggle.linewise.current()
end,
desc = "Comment: Toggle Linewise",
},
{
"<leader>/",
function()
local api = require("Comment.api")
local esc = vim.api.nvim_replace_termcodes("<ESC>", true, false, true)
vim.api.nvim_feedkeys(esc, "nx", false)
api.toggle.linewise(vim.fn.visualmode())
end,
desc = "Comment: Toggle Blockwise",
mode = { "x" },
},
},
},
}

View File

@ -105,15 +105,8 @@ return {
build = ":TSUpdate", build = ":TSUpdate",
event = { "BufReadPre", "BufNewFile", "WinLeave" }, event = { "BufReadPre", "BufNewFile", "WinLeave" },
dependencies = { dependencies = {
"nvim-treesitter/playground",
"nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/nvim-treesitter-textobjects",
"RRethy/nvim-treesitter-endwise", "RRethy/nvim-treesitter-endwise",
{
"andymass/vim-matchup",
init = function()
vim.g.matchup_matchparen_offscreen = { method = nil }
end,
},
}, },
init = function() init = function()
vim.api.nvim_create_autocmd("FileReadPre", { vim.api.nvim_create_autocmd("FileReadPre", {
@ -170,7 +163,6 @@ return {
end end
end, end,
}, },
matchup = { enable = true },
autotag = { autotag = {
enable = true, enable = true,
}, },

View File

@ -1,7 +1,7 @@
return { return {
{ {
"mcauley-penney/visual-whitespace.nvim", "mcauley-penney/visual-whitespace.nvim",
events = "ModeChanged", event = "ModeChanged",
opts = { opts = {
highlight = { link = "visual-whitespace" }, highlight = { link = "visual-whitespace" },
}, },