From f1d0a8b2df6a459881d1f0d925f6bef7cc0b772c Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Fri, 26 Sep 2025 12:59:03 +0000
Subject: [PATCH] Update nvf, add lazygit

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 .../configs/user/console/lazygit/default.nix  | 20 ++++++
 .../configs/user/console/neovim/default.nix   | 72 ++++++++-----------
 hosts/elara/users/nikara/default.nix          |  1 +
 hosts/himalia/users/nick/default.nix          |  1 +
 4 files changed, 52 insertions(+), 42 deletions(-)
 create mode 100644 hosts/common/configs/user/console/lazygit/default.nix

diff --git a/hosts/common/configs/user/console/lazygit/default.nix b/hosts/common/configs/user/console/lazygit/default.nix
new file mode 100644
index 0000000..3595283
--- /dev/null
+++ b/hosts/common/configs/user/console/lazygit/default.nix
@@ -0,0 +1,20 @@
+{ user, home }:
+{ ... }:
+{
+
+  environment.persistence."/persist/state"."${home}/.local/state/lazygit" = { };
+
+  home-manager.users.${user}.programs.lazygit = {
+    enable = true;
+
+    settings = {
+      gui = {
+        showBottomLine = false;
+        nerdFontsVersion = "3";
+        animateExplosion = false;
+      };
+
+      disableStartupPopups = true;
+    };
+  };
+}
diff --git a/hosts/common/configs/user/console/neovim/default.nix b/hosts/common/configs/user/console/neovim/default.nix
index 22f87cf..efe316d 100644
--- a/hosts/common/configs/user/console/neovim/default.nix
+++ b/hosts/common/configs/user/console/neovim/default.nix
@@ -36,7 +36,6 @@
             };
 
             binds = {
-              # hardtime-nvim.enable = true;
               whichKey.enable = true;
             };
 
@@ -50,9 +49,9 @@
               comment-nvim.enable = true;
             };
 
-            # dashboard = {
-            #   alpha.enable = true;
-            # };
+            dashboard = {
+              alpha.enable = true;
+            };
 
             diagnostics = {
               enable = true;
@@ -62,15 +61,11 @@
               };
             };
 
-            # formatter = {
-            #   conform-nvim.enable = true;
-            # };
-
             git = {
               enable = true;
-              # git-conflict.enable = true;
+              git-conflict.enable = true;
               gitsigns.enable = true;
-              # neogit.enable = true;
+              vim-fugitive.enable = true;
             };
 
             languages = {
@@ -114,14 +109,12 @@
             lsp = {
               enable = true;
               formatOnSave = true;
-              # nvim-docs-view.enable = true;
-              # otter-nvim.enable = true;
+              otter-nvim = {
+                enable = true;
+                setupOpts.handle_leading_whitespace = true;
+              };
             };
 
-            # minimap = {
-            #   codewindow.enable = true;
-            # };
-
             notify = {
               nvim-notify.enable = true;
             };
@@ -133,16 +126,8 @@
               smartindent = true;
             };
 
-            # projects = {
-            #   project-nvim.enable = true;
-            # };
-
             searchCase = "smart";
 
-            # snippets = {
-            #   luasnip.enable = true;
-            # };
-
             tabline = {
               nvimBufferline = {
                 enable = true;
@@ -174,6 +159,7 @@
             terminal = {
               toggleterm = {
                 enable = true;
+                lazygit.enable = true;
                 setupOpts.winbar.enabled = false;
               };
             };
@@ -186,31 +172,25 @@
             };
 
             ui = {
-              # breadcrumbs = {
-              #   enable = true;
-              #   navbuddy.enable = true;
-              # };
               colorizer.enable = true;
-              # fastaction.enable = true;
-              # illuminate.enable = true;
+              illuminate.enable = true;
             };
 
             undoFile.enable = true;
 
             utility = {
-              # diffview-nvim.enable = true;
-              # icon-picker.enable = true;
-              # images = {
-              #   img-clip.enable = true;
-              # };
-              # mkdir.enable = true;
+              images = {
+                img-clip = {
+                  enable = true;
+                  setupOpts.verbose = false;
+                };
+              };
+              mkdir.enable = true;
               motion = {
                 precognition.enable = true;
               };
-              # nvim-biscuits.enable = true;
-              # smart-splits.enable = true;
               surround.enable = true;
-              # undotree.enable = true;
+              undotree.enable = true;
               yazi-nvim = {
                 enable = true;
                 setupOpts.open_for_directories = true;
@@ -218,9 +198,10 @@
             };
 
             visuals = {
-              # cinnamon-nvim.enable = true;
-              # fidget-nvim.enable = true;
-              # highlight-undo.enable = true;
+              highlight-undo = {
+                enable = true;
+                setupOpts.duration = 250;
+              };
               indent-blankline.enable = true;
               nvim-cursorline.enable = true;
               nvim-scrollbar.enable = true;
@@ -274,6 +255,13 @@
                 silent = true;
                 desc = "Save & Quit";
               }
+              {
+                mode = [ "n" ];
+                key = "<leader>be";
+                action = "<cmd>enew<CR>";
+                silent = true;
+                desc = "New buffer";
+              }
             ];
           };
         };
diff --git a/hosts/elara/users/nikara/default.nix b/hosts/elara/users/nikara/default.nix
index 1ecce4e..4030488 100644
--- a/hosts/elara/users/nikara/default.nix
+++ b/hosts/elara/users/nikara/default.nix
@@ -27,6 +27,7 @@ in
     (import ../../../common/configs/user/console/ip { inherit user home; })
     (import ../../../common/configs/user/console/jq { inherit user home; })
     (import ../../../common/configs/user/console/kubernetes { inherit user home; })
+    (import ../../../common/configs/user/console/lazygit { inherit user home; })
     (import ../../../common/configs/user/console/lsof { inherit user home; })
     (import ../../../common/configs/user/console/mprocs { inherit user home; })
     (import ../../../common/configs/user/console/ncdu { inherit user home; })
diff --git a/hosts/himalia/users/nick/default.nix b/hosts/himalia/users/nick/default.nix
index d9b54a0..f6b0615 100644
--- a/hosts/himalia/users/nick/default.nix
+++ b/hosts/himalia/users/nick/default.nix
@@ -28,6 +28,7 @@ in
     (import ../../../common/configs/user/console/imagemagick { inherit user home; })
     (import ../../../common/configs/user/console/ip { inherit user home; })
     (import ../../../common/configs/user/console/jq { inherit user home; })
+    (import ../../../common/configs/user/console/lazygit { inherit user home; })
     (import ../../../common/configs/user/console/libvirt { inherit user home; })
     (import ../../../common/configs/user/console/lsof { inherit user home; })
     (import ../../../common/configs/user/console/mprocs { inherit user home; })