christoph/flake-nixinator
1
Fork 0
Code Activity

Compare commits

base: christoph:357fcecee71c2f0acb012f7d050536d16149e12e
Branches Tags
christoph:master
..
compare: christoph:0846fb0860ef6e25cfb2a1eb42307f84a80cef99
Branches Tags
christoph:master

2 Commits
357fcecee7 ... 0846fb0860

Author SHA1 Message Date
Christoph Urlacher
0846fb0860 Refresh generated neovim config 2024-08-15 13:52:26 +02:00
Christoph Urlacher
d878c984a8 Update nvim config after which-key + better-escape updates 2024-08-15 13:52:20 +02:00
3 changed files with 108 additions and 77 deletions
Expand all files Collapse all files

11
config/neovim/config.lua
View File

@ -125,7 +125,7 @@ require("lazy").setup({
event = { "InsertEnter" }, event = { "InsertEnter" },
lazy = true, lazy = true,
name = "better_escape", name = "better_escape",
opts = { mapping = { "jk" }, timeout = 200 }, opts = { default_mappings = true, timeout = 200 },
}, },
{ {
"clangd_extensions", "clangd_extensions",
@ -1178,9 +1178,18 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("which-key").setup(opts) require("which-key").setup(opts)
end, end,
dependencies = {
{
"mini",
dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/mini.nvim",
lazy = true,
name = "mini",
},
},
dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/which-key.nvim", dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/which-key.nvim",
lazy = false, lazy = false,
name = "which-key", name = "which-key",
opts = { preset = "modern" },
priority = 500, priority = 500,
}, },
{ {

159
config/neovim/config_nix.lua
View File

@ -68,7 +68,7 @@ end
vim.loader.enable() vim.loader.enable()
require("lazy").setup({ require("lazy").setup({
dev = { dev = {
path = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins", path = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins",
patterns = { "." }, patterns = { "." },
fallback = false, fallback = false,
}, },
@ -83,7 +83,7 @@ require("lazy").setup({
colorscheme catppuccin colorscheme catppuccin
]]) ]])
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/catppuccin-nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/catppuccin-nvim",
lazy = false, lazy = false,
name = "catppuccin", name = "catppuccin",
opts = { background = { dark = "mocha", light = "latte" }, flavour = "mocha" }, opts = { background = { dark = "mocha", light = "latte" }, flavour = "mocha" },
@ -94,7 +94,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("nvim-web-devicons").setup(opts) require("nvim-web-devicons").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-web-devicons", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-web-devicons",
lazy = true, lazy = true,
name = "nvim-web-devicons", name = "nvim-web-devicons",
}, },
@ -103,7 +103,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("nvim-autopairs").setup(opts) require("nvim-autopairs").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-autopairs", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-autopairs",
event = { "InsertEnter" }, event = { "InsertEnter" },
lazy = true, lazy = true,
name = "nvim-autopairs", name = "nvim-autopairs",
@ -112,7 +112,7 @@ require("lazy").setup({
{ {
"vim-bbye", "vim-bbye",
cmd = { "Bdelete", "Bwipeout" }, cmd = { "Bdelete", "Bwipeout" },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vim-bbye", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vim-bbye",
lazy = true, lazy = true,
name = "vim-bbye", name = "vim-bbye",
}, },
@ -121,18 +121,18 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("better_escape").setup(opts) require("better_escape").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/better-escape.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/better-escape.nvim",
event = { "InsertEnter" }, event = { "InsertEnter" },
lazy = true, lazy = true,
name = "better_escape", name = "better_escape",
opts = { mapping = { "jk" }, timeout = 200 }, opts = { default_mappings = true, timeout = 200 },
}, },
{ {
"clangd_extensions", "clangd_extensions",
config = function(_, opts) config = function(_, opts)
require("clangd_extensions").setup(opts) require("clangd_extensions").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/clangd_extensions.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/clangd_extensions.nvim",
lazy = true, lazy = true,
name = "clangd_extensions", name = "clangd_extensions",
opts = { inlay_hints = { inline = false } }, opts = { inlay_hints = { inline = false } },
@ -145,50 +145,50 @@ require("lazy").setup({
dependencies = { dependencies = {
{ {
"cmp-async-path", "cmp-async-path",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-async-path", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-async-path",
lazy = true, lazy = true,
name = "cmp-async-path", name = "cmp-async-path",
}, },
{ {
"cmp-buffer", "cmp-buffer",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-buffer", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-buffer",
enabled = false, enabled = false,
lazy = true, lazy = true,
name = "cmp-buffer", name = "cmp-buffer",
}, },
{ {
"cmp-cmdline", "cmp-cmdline",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-cmdline", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-cmdline",
enabled = false, enabled = false,
lazy = true, lazy = true,
name = "cmp-cmdline", name = "cmp-cmdline",
}, },
{ {
"cmp-emoji", "cmp-emoji",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-emoji", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-emoji",
lazy = true, lazy = true,
name = "cmp-emoji", name = "cmp-emoji",
}, },
{ {
"cmp-nvim-lsp", "cmp-nvim-lsp",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-nvim-lsp", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-nvim-lsp",
lazy = true, lazy = true,
name = "cmp-nvim-lsp", name = "cmp-nvim-lsp",
}, },
{ {
"cmp-nvim-lsp-signature-help", "cmp-nvim-lsp-signature-help",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-nvim-lsp-signature-help", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-nvim-lsp-signature-help",
lazy = true, lazy = true,
name = "cmp-nvim-lsp-signature-help", name = "cmp-nvim-lsp-signature-help",
}, },
{ {
"cmp_luasnip", "cmp_luasnip",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp_luasnip", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp_luasnip",
lazy = true, lazy = true,
name = "cmp_luasnip", name = "cmp_luasnip",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-cmp", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-cmp",
event = { "InsertEnter" }, event = { "InsertEnter" },
lazy = true, lazy = true,
name = "cmp", name = "cmp",
@ -269,7 +269,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("ts_context_commentstring").setup(opts) require("ts_context_commentstring").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-ts-context-commentstring", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-ts-context-commentstring",
init = function() init = function()
-- Skip compatibility checks -- Skip compatibility checks
vim.g.skip_ts_context_commentstring_module = true vim.g.skip_ts_context_commentstring_module = true
@ -278,7 +278,7 @@ require("lazy").setup({
name = "ts_context_commentstring", name = "ts_context_commentstring",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/comment.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/comment.nvim",
lazy = false, lazy = false,
name = "Comment", name = "Comment",
opts = { opts = {
@ -295,7 +295,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("conform").setup(opts) require("conform").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/conform.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/conform.nvim",
event = { "BufReadPost", "BufNewFile" }, event = { "BufReadPost", "BufNewFile" },
lazy = true, lazy = true,
name = "conform", name = "conform",
@ -335,7 +335,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("nvim-web-devicons").setup(opts) require("nvim-web-devicons").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-web-devicons", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-web-devicons",
lazy = true, lazy = true,
name = "nvim-web-devicons", name = "nvim-web-devicons",
}, },
@ -362,30 +362,30 @@ require("lazy").setup({
dependencies = { dependencies = {
{ {
"plenary", "plenary",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
lazy = true, lazy = true,
name = "plenary", name = "plenary",
}, },
{ {
"telescope-fzf-native", "telescope-fzf-native",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-fzf-native.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-fzf-native.nvim",
lazy = true, lazy = true,
name = "telescope-fzf-native", name = "telescope-fzf-native",
}, },
{ {
"telescope-undo", "telescope-undo",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-undo.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-undo.nvim",
lazy = true, lazy = true,
name = "telescope-undo", name = "telescope-undo",
}, },
{ {
"telescope-ui-select", "telescope-ui-select",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-ui-select.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-ui-select.nvim",
lazy = true, lazy = true,
name = "telescope-ui-select", name = "telescope-ui-select",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope.nvim",
lazy = true, lazy = true,
name = "telescope", name = "telescope",
opts = { opts = {
@ -401,7 +401,7 @@ require("lazy").setup({
}, },
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/persisted.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/persisted.nvim",
lazy = true, lazy = true,
name = "persisted", name = "persisted",
opts = { opts = {
@ -414,7 +414,7 @@ require("lazy").setup({
}, },
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/dashboard-nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/dashboard-nvim",
lazy = false, lazy = false,
name = "dashboard", name = "dashboard",
opts = { opts = {
@ -444,13 +444,13 @@ require("lazy").setup({
{ {
"diffview", "diffview",
cmd = { "DiffviewOpen" }, cmd = { "DiffviewOpen" },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/diffview.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/diffview.nvim",
lazy = true, lazy = true,
name = "diffview", name = "diffview",
}, },
{ {
"direnv", "direnv",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/direnv.vim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/direnv.vim",
lazy = false, lazy = false,
name = "direnv", name = "direnv",
}, },
@ -459,7 +459,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("flash").setup(opts) require("flash").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/flash.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/flash.nvim",
keys = { "s", "S", "f", "F", "t", "T" }, keys = { "s", "S", "f", "F", "t", "T" },
lazy = true, lazy = true,
name = "flash", name = "flash",
@ -467,7 +467,7 @@ require("lazy").setup({
{ {
"gitmessenger", "gitmessenger",
cmd = { "GitMessenger" }, cmd = { "GitMessenger" },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/git-messenger.vim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/git-messenger.vim",
init = function() init = function()
for k, v in pairs({ for k, v in pairs({
["git_messenger_floating_win_opts"] = { ["border"] = "rounded" }, ["git_messenger_floating_win_opts"] = { ["border"] = "rounded" },
@ -484,7 +484,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("gitsigns").setup(opts) require("gitsigns").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/gitsigns.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/gitsigns.nvim",
event = { "BufReadPost", "BufNewFile" }, event = { "BufReadPost", "BufNewFile" },
lazy = true, lazy = true,
name = "gitsigns", name = "gitsigns",
@ -492,7 +492,7 @@ require("lazy").setup({
}, },
{ {
"haskell-tools", "haskell-tools",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/haskell-tools.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/haskell-tools.nvim",
lazy = false, lazy = false,
name = "haskell-tools", name = "haskell-tools",
}, },
@ -501,7 +501,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("illuminate").configure(opts) require("illuminate").configure(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vim-illuminate", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vim-illuminate",
event = { "BufreadPost", "BufNewFile" }, event = { "BufreadPost", "BufNewFile" },
lazy = true, lazy = true,
name = "illuminate", name = "illuminate",
@ -521,14 +521,14 @@ require("lazy").setup({
}, },
{ {
"intellitab", "intellitab",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/intellitab.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/intellitab.nvim",
event = { "InsertEnter" }, event = { "InsertEnter" },
lazy = true, lazy = true,
name = "intellitab", name = "intellitab",
}, },
{ {
"jdtls", "jdtls",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-jdtls", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-jdtls",
lazy = false, lazy = false,
name = "jdtls", name = "jdtls",
}, },
@ -537,7 +537,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("nvim-lastplace").setup(opts) require("nvim-lastplace").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-lastplace", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-lastplace",
lazy = false, lazy = false,
name = "nvim-lastplace", name = "nvim-lastplace",
}, },
@ -547,12 +547,12 @@ require("lazy").setup({
dependencies = { dependencies = {
{ {
"plenary", "plenary",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
lazy = true, lazy = true,
name = "plenary", name = "plenary",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/lazygit.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/lazygit.nvim",
lazy = true, lazy = true,
name = "lazygit", name = "lazygit",
}, },
@ -565,7 +565,7 @@ require("lazy").setup({
lint[k] = v lint[k] = v
end end
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-lint", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-lint",
event = { "BufReadPost", "BufNewFile" }, event = { "BufReadPost", "BufNewFile" },
lazy = true, lazy = true,
name = "lint", name = "lint",
@ -679,12 +679,12 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("lazydev").setup(opts) require("lazydev").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vimplugin-nvim-lazydev", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vimplugin-nvim-lazydev",
ft = { "lua" }, ft = { "lua" },
name = "lazydev", name = "lazydev",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-lspconfig", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-lspconfig",
event = { "BufReadPost", "BufNewFile" }, event = { "BufReadPost", "BufNewFile" },
lazy = true, lazy = true,
name = "lspconfig", name = "lspconfig",
@ -702,7 +702,7 @@ require("lazy").setup({
unhide = false, unhide = false,
}) })
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/lualine.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/lualine.nvim",
event = { "BufReadPost", "BufNewFile" }, event = { "BufReadPost", "BufNewFile" },
lazy = true, lazy = true,
name = "lualine", name = "lualine",
@ -730,7 +730,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("luasnip").config.set_config(opts) require("luasnip").config.set_config(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/luasnip", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/luasnip",
lazy = false, lazy = false,
name = "luasnip", name = "luasnip",
}, },
@ -742,7 +742,7 @@ require("lazy").setup({
vim.keymap.del("x", "<space>nr") vim.keymap.del("x", "<space>nr")
vim.keymap.del("n", "<space>nr") vim.keymap.del("n", "<space>nr")
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/NrrwRgn", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/NrrwRgn",
lazy = true, lazy = true,
name = "narrow-region", name = "narrow-region",
}, },
@ -779,13 +779,13 @@ require("lazy").setup({
-- } -- }
-- }) -- })
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-navic", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-navic",
lazy = true, lazy = true,
name = "navic", name = "navic",
opts = { click = true, depth_limit = 5, highlight = true, lsp = { auto_attach = true } }, opts = { click = true, depth_limit = 5, highlight = true, lsp = { auto_attach = true } },
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-navbuddy", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-navbuddy",
lazy = true, lazy = true,
name = "navbuddy", name = "navbuddy",
opts = { lsp = { auto_attach = true }, window = { border = "rounded" } }, opts = { lsp = { auto_attach = true }, window = { border = "rounded" } },
@ -799,7 +799,7 @@ require("lazy").setup({
dependencies = { dependencies = {
{ {
"plenary", "plenary",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
lazy = true, lazy = true,
name = "plenary", name = "plenary",
}, },
@ -808,18 +808,18 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("nvim-web-devicons").setup(opts) require("nvim-web-devicons").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-web-devicons", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-web-devicons",
lazy = true, lazy = true,
name = "nvim-web-devicons", name = "nvim-web-devicons",
}, },
{ {
"nui", "nui",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nui.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nui.nvim",
lazy = true, lazy = true,
name = "nui", name = "nui",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/neo-tree.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/neo-tree.nvim",
lazy = true, lazy = true,
name = "neo-tree", name = "neo-tree",
opts = { opts = {
@ -874,18 +874,18 @@ require("lazy").setup({
notify.setup(opts) notify.setup(opts)
vim.notify = notify -- Vim uses notify by default vim.notify = notify -- Vim uses notify by default
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-notify", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-notify",
lazy = true, lazy = true,
name = "notify", name = "notify",
}, },
{ {
"nui", "nui",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nui.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nui.nvim",
lazy = true, lazy = true,
name = "nui", name = "nui",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/noice.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/noice.nvim",
lazy = false, lazy = false,
name = "noice", name = "noice",
opts = { opts = {
@ -921,13 +921,13 @@ require("lazy").setup({
}, },
{ {
"rainbow-delimiters", "rainbow-delimiters",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/rainbow-delimiters.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/rainbow-delimiters.nvim",
lazy = false, lazy = false,
name = "rainbow-delimiters", name = "rainbow-delimiters",
}, },
{ {
"rustaceanvim", "rustaceanvim",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/rustaceanvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/rustaceanvim",
init = function() init = function()
vim.g.rustaceanvim = { vim.g.rustaceanvim = {
tools = { tools = {
@ -973,7 +973,7 @@ require("lazy").setup({
}, },
{ {
"sandwich", "sandwich",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vim-sandwich", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vim-sandwich",
init = function() init = function()
-- Disable default keymaps -- Disable default keymaps
vim.g.sandwich_no_default_key_mappings = 1 vim.g.sandwich_no_default_key_mappings = 1
@ -985,7 +985,7 @@ require("lazy").setup({
}, },
{ {
"sleuth", "sleuth",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vim-sleuth", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vim-sleuth",
lazy = false, lazy = false,
name = "sleuth", name = "sleuth",
}, },
@ -1003,30 +1003,30 @@ require("lazy").setup({
dependencies = { dependencies = {
{ {
"plenary", "plenary",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
lazy = true, lazy = true,
name = "plenary", name = "plenary",
}, },
{ {
"telescope-fzf-native", "telescope-fzf-native",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-fzf-native.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-fzf-native.nvim",
lazy = true, lazy = true,
name = "telescope-fzf-native", name = "telescope-fzf-native",
}, },
{ {
"telescope-undo", "telescope-undo",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-undo.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-undo.nvim",
lazy = true, lazy = true,
name = "telescope-undo", name = "telescope-undo",
}, },
{ {
"telescope-ui-select", "telescope-ui-select",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-ui-select.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-ui-select.nvim",
lazy = true, lazy = true,
name = "telescope-ui-select", name = "telescope-ui-select",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope.nvim",
lazy = true, lazy = true,
name = "telescope", name = "telescope",
opts = { opts = {
@ -1047,12 +1047,12 @@ require("lazy").setup({
dependencies = { dependencies = {
{ {
"plenary", "plenary",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
lazy = true, lazy = true,
name = "plenary", name = "plenary",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/todo-comments.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/todo-comments.nvim",
event = { "BufReadPost", "BufNewFile" }, event = { "BufReadPost", "BufNewFile" },
lazy = true, lazy = true,
name = "todo-comments", name = "todo-comments",
@ -1075,7 +1075,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("toggleterm").setup(opts) require("toggleterm").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/toggleterm.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/toggleterm.nvim",
keys = { "<C-/>" }, keys = { "<C-/>" },
lazy = true, lazy = true,
name = "toggleterm", name = "toggleterm",
@ -1102,7 +1102,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("nvim-treesitter.configs").setup(opts) require("nvim-treesitter.configs").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-treesitter", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-treesitter",
event = { "BufReadPost", "BufNewFile" }, event = { "BufReadPost", "BufNewFile" },
init = function() init = function()
-- Fix treesitter grammars/parsers on nix -- Fix treesitter grammars/parsers on nix
@ -1134,7 +1134,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("trim").setup(opts) require("trim").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/trim.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/trim.nvim",
lazy = false, lazy = false,
name = "trim", name = "trim",
}, },
@ -1144,7 +1144,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("trouble").setup(opts) require("trouble").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/trouble.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/trouble.nvim",
lazy = true, lazy = true,
name = "trouble", name = "trouble",
}, },
@ -1156,18 +1156,18 @@ require("lazy").setup({
dependencies = { dependencies = {
{ {
"promise", "promise",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/promise-async", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/promise-async",
lazy = true, lazy = true,
name = "promise", name = "promise",
}, },
}, },
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-ufo", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-ufo",
lazy = false, lazy = false,
name = "ufo", name = "ufo",
}, },
{ {
"vimtex", "vimtex",
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vimtex", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vimtex",
init = function() init = function()
vim.g.vimtex_view_method = "zathura" vim.g.vimtex_view_method = "zathura"
end, end,
@ -1178,9 +1178,18 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("which-key").setup(opts) require("which-key").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/which-key.nvim", dependencies = {
{
"mini",
dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/mini.nvim",
lazy = true,
name = "mini",
},
},
dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/which-key.nvim",
lazy = false, lazy = false,
name = "which-key", name = "which-key",
opts = { preset = "modern" },
priority = 500, priority = 500,
}, },
{ {
@ -1189,7 +1198,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("winshift").setup(opts) require("winshift").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/winshift.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/winshift.nvim",
lazy = true, lazy = true,
name = "winshift", name = "winshift",
opts = { opts = {
@ -1203,7 +1212,7 @@ require("lazy").setup({
config = function(_, opts) config = function(_, opts)
require("yanky").setup(opts) require("yanky").setup(opts)
end, end,
dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/yanky.nvim", dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/yanky.nvim",
lazy = true, lazy = true,
name = "yanky", name = "yanky",
}, },

15
home/modules/neovim/default.nix
View File

@ -188,7 +188,8 @@ in {
event = ["InsertEnter"]; event = ["InsertEnter"];
config = mkDefaultConfig name; config = mkDefaultConfig name;
opts = { opts = {
mapping = ["jk"]; # mapping = ["jk"]; # NOTE: Deprecated
default_mappings = true;
timeout = 200; # In ms timeout = 200; # In ms
}; };
}; };
@ -1646,12 +1647,24 @@ in {
''; '';
}; };
_mini = {
name = "mini";
pkg = pkgs.vimPlugins.mini-nvim;
lazy = true;
};
which-key = rec { which-key = rec {
name = "which-key"; name = "which-key";
pkg = pkgs.vimPlugins.which-key-nvim; pkg = pkgs.vimPlugins.which-key-nvim;
lazy = false; lazy = false;
dependencies = [
_mini
];
priority = 500; priority = 500;
config = mkDefaultConfig name; config = mkDefaultConfig name;
opts = {
preset = "modern";
};
}; };
winshift = rec { winshift = rec {