From 152b056a5459782d436a0a57ac6443e96408e55a Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Tue, 5 Aug 2025 00:13:49 +0200 Subject: [PATCH] added some stuff for lazygit and snacks.image --- flake.nix | 14 +++++++++++++- lua/myLuaConf/plugins/init.lua | 20 ++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index f92d331..0364a63 100644 --- a/flake.nix +++ b/flake.nix @@ -83,6 +83,15 @@ lazygit zoxide ]; + markdown = [ + mermaid-cli + imagemagick + texliveSmall + ]; + git = [ + lazygit + git + ]; lsp = { rust = [ rust-analyzer @@ -182,8 +191,10 @@ lazydev-nvim ]; }; - always = [ + git = [ gitsigns-nvim + ]; + always = [ nvim-surround leap-nvim ]; @@ -269,6 +280,7 @@ }; categories = { always = true; + git = true; treesitter = true; markdown = true; lsp = true; diff --git a/lua/myLuaConf/plugins/init.lua b/lua/myLuaConf/plugins/init.lua index 2c24fcc..bd38bd3 100644 --- a/lua/myLuaConf/plugins/init.lua +++ b/lua/myLuaConf/plugins/init.lua @@ -66,13 +66,11 @@ end if nixCats("always") then -- Potentially checkout the lazygit module. local Snacks = require("snacks") - Snacks.setup({ + local config = { bufdelete = { enable = true }, dim = { enable = true }, git = { enable = true }, - image = { enable = true }, input = { enable = true }, - lazygit = { enable = true }, notifier = { enable = true }, terminal = { enable = true }, toggle = { enable = true }, @@ -104,7 +102,16 @@ if nixCats("always") then scope = { enabled = true }, chunk = { enabled = true }, }, - }) + image = { enabled = false }, + lazygit = { enabled = false, configure = false }, + } + if nixCats("markdown") then + config.image.enable = true + end + if nixCats("git") then + config.lazygit.enable = true + end + Snacks.setup(config) -- setup keybinds. vim.keymap.set("n", "bd", Snacks.bufdelete.delete, { desc = "delete buffer" }) @@ -130,6 +137,7 @@ if nixCats("always") then vim.keymap.set("n", "gb", Snacks.picker.git_branches, { desc = "[G]it [B]ranch" }) vim.keymap.set("n", "gl", Snacks.picker.git_log, { desc = "[G]it [L]og" }) vim.keymap.set("n", "gd", Snacks.picker.git_diff, { desc = "[G]it [D]iff" }) + vim.keymap.set("n", "gt", Snacks.lazygit.open, { desc = "lazy[G]it [T]UI" }) -- setup toggles Snacks.toggle.option("spell", { name = "spelling" }):map("cs") @@ -225,7 +233,7 @@ require('lze').load { local venn_enabled = vim.inspect(vim.b.venn_enabled) if venn_enabled == "nil" then vim.b.venn_enabled = true - vim.o.virtualedit="all" + vim.o.virtualedit = "all" -- draw a line on HJKL keystokes vim.api.nvim_buf_set_keymap(0, "n", "J", "j:VBox", { noremap = true }) vim.api.nvim_buf_set_keymap(0, "n", "K", "k:VBox", { noremap = true }) @@ -234,7 +242,7 @@ require('lze').load { -- draw a box by pressing "f" with visual selection vim.api.nvim_buf_set_keymap(0, "v", "f", ":VBox", { noremap = true }) else - vim.o.virtualedit="" + vim.o.virtualedit = "" vim.api.nvim_buf_del_keymap(0, "n", "J") vim.api.nvim_buf_del_keymap(0, "n", "K") vim.api.nvim_buf_del_keymap(0, "n", "L")