From a823e6a3251a40188df8bf3b3791e0ad10ff82b9 Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Wed, 10 Sep 2025 10:36:04 +0000 Subject: [PATCH] jjui --- modules/home/default.nix | 1 - modules/home/lazygit.nix | 58 ---------------------- modules/home/neovim/default.nix | 1 + modules/home/neovim/mappings.nix | 11 ++++ modules/home/neovim/plugins/toggleterm.nix | 20 ++++++++ 5 files changed, 32 insertions(+), 59 deletions(-) delete mode 100644 modules/home/lazygit.nix create mode 100644 modules/home/neovim/plugins/toggleterm.nix diff --git a/modules/home/default.nix b/modules/home/default.nix index 48ab7eb..bcbb981 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -13,7 +13,6 @@ ./fish.nix ./fzf.nix ./git.nix - ./lazygit.nix ./mise.nix ./neovim ./opencode.nix diff --git a/modules/home/lazygit.nix b/modules/home/lazygit.nix deleted file mode 100644 index c95a668..0000000 --- a/modules/home/lazygit.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - programs.lazygit = { - enable = true; - settings = { - git = { - paging = { - colorArg = "always"; - pager = "DELTA_FEATURES=decorations delta --light --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format=\"lazygit-edit://{path}:{line}\""; - }; - - commit = { - signOff = true; - }; - }; - - gui = { - theme = { - activeBorderColor = [ - "#8839ef" - "bold" - ]; - inactiveBorderColor = [ - "#6c6f85" - ]; - optionsTextColor = [ - "#1e66f5" - ]; - selectedLineBgColor = [ - "#ccd0da" - ]; - cherryPickedCommitBgColor = [ - "#bcc0cc" - ]; - cherryPickedCommitFgColor = [ - "#8839ef" - ]; - unstagedChangesColor = [ - "#d20f39" - ]; - defaultFgColor = [ - "#4c4f69" - ]; - searchingActiveBorderColor = [ - "#df8e1d" - ]; - }; - - authorColors = { - "*" = "#7287fd"; - }; - }; - }; - }; - - home.shellAliases = { - lg = "lazygit"; - }; -} diff --git a/modules/home/neovim/default.nix b/modules/home/neovim/default.nix index 4d808f2..bd19865 100644 --- a/modules/home/neovim/default.nix +++ b/modules/home/neovim/default.nix @@ -11,6 +11,7 @@ ./plugins/mini.nix ./plugins/supermaven.nix ./plugins/oil.nix + ./plugins/toggleterm.nix ./plugins/treesitter.nix ]; diff --git a/modules/home/neovim/mappings.nix b/modules/home/neovim/mappings.nix index 4329975..458bfd4 100644 --- a/modules/home/neovim/mappings.nix +++ b/modules/home/neovim/mappings.nix @@ -86,6 +86,17 @@ action = ":Pick lsp scope='document_symbol'"; options.desc = "Symbols (LSP, buffer)"; } + # g - git + { + mode = "n"; + key = "gg"; + action.__raw = '' + function() + require('toggleterm.terminal').Terminal:new({ cmd = 'jjui', direction = 'float' }):toggle() + end + ''; + options.desc = "jjui"; + } # l - lsp/formatter { mode = "n"; diff --git a/modules/home/neovim/plugins/toggleterm.nix b/modules/home/neovim/plugins/toggleterm.nix new file mode 100644 index 0000000..4c840c5 --- /dev/null +++ b/modules/home/neovim/plugins/toggleterm.nix @@ -0,0 +1,20 @@ +{ + programs.nixvim.plugins.toggleterm = { + enable = true; + settings = { + open_mapping = null; + direction = "float"; + float_opts = { + border = "curved"; + winblend = 3; + }; + size = 20; + hide_numbers = true; + shade_terminals = true; + shading_factor = 2; + start_in_insert = true; + close_on_exit = true; + shell = "fish"; + }; + }; +} \ No newline at end of file