6 files changed, 104 insertions, 28 deletions
diff --git a/modules/tools/nixvim/default.nix b/modules/tools/nixvim/default.nix
index 6dd7b85..f9c604e 100644
--- a/modules/tools/nixvim/default.nix
+++ b/modules/tools/nixvim/default.nix
@@ -11,8 +11,7 @@
     enable = lib.mkEnableOption "Enables nixvim.";
   };
 
-  config = lib.mkIf config.tools.nixvim.enable
-  {
+  config = lib.mkIf config.tools.nixvim.enable {
     programs.nixvim = {
       enable = true;
       defaultEditor = true;
diff --git a/modules/tools/nixvim/keymaps.nix b/modules/tools/nixvim/keymaps.nix
index 521363d..66c83bd 100644
--- a/modules/tools/nixvim/keymaps.nix
+++ b/modules/tools/nixvim/keymaps.nix
@@ -3,16 +3,34 @@
 {
   config = lib.mkIf config.tools.nixvim.enable {
     programs.nixvim.keymaps = [
-      { key = "<c-h>"; action = "<c-w>h"; }
-      { key = "<c-w>"; action = "<c-w>j"; }
-      { key = "<c-k>"; action = "<c-w>k"; }
-      { key = "<c-l>"; action = "<c-w>l"; }
+      {
+        key = "<c-h>";
+        action = "<c-w>h";
+      }
+      {
+        key = "<c-w>";
+        action = "<c-w>j";
+      }
+      {
+        key = "<c-k>";
+        action = "<c-w>k";
+      }
+      {
+        key = "<c-l>";
+        action = "<c-w>l";
+      }
       {
         key = "<c-n>";
         action = "<cmd>NvimTreeToggle<cr>";
-        mode = [ "n" "i" ];
+        mode = [
+          "n"
+          "i"
+        ];
+      }
+      {
+        key = "<c-c>";
+        action = "<cmd>NotificationsClear<cr>";
       }
-      { key = "<c-c>"; action = "<cmd>NotificationsClear<cr>"; }
     ];
   };
 }
diff --git a/modules/tools/nixvim/plugins/lualine.nix b/modules/tools/nixvim/plugins/lualine.nix
index 3138887..204bc44 100644
--- a/modules/tools/nixvim/plugins/lualine.nix
+++ b/modules/tools/nixvim/plugins/lualine.nix
@@ -7,29 +7,79 @@
       options = {
         theme = with config.scheme.withHashtag; {
           normal = {
-            a = { fg = base00; bg = base0D; gui = "bold"; };
-            b = { fg = base05; bg = base01; };
-            c = { fg = base05; bg = base00; };
+            a = {
+              fg = base00;
+              bg = base0D;
+              gui = "bold";
+            };
+            b = {
+              fg = base05;
+              bg = base01;
+            };
+            c = {
+              fg = base05;
+              bg = base00;
+            };
           };
           insert = {
-            a = { fg = base00; bg = base0B; gui = "bold"; };
-            b = { fg = base05; bg = base01; };
-            c = { fg = base05; bg = base00; };
+            a = {
+              fg = base00;
+              bg = base0B;
+              gui = "bold";
+            };
+            b = {
+              fg = base05;
+              bg = base01;
+            };
+            c = {
+              fg = base05;
+              bg = base00;
+            };
           };
           visual = {
-            a = { fg = base00; bg = base0A; gui = "bold"; };
-            b = { fg = base05; bg = base01; };
-            c = { fg = base05; bg = base00; };
+            a = {
+              fg = base00;
+              bg = base0A;
+              gui = "bold";
+            };
+            b = {
+              fg = base05;
+              bg = base01;
+            };
+            c = {
+              fg = base05;
+              bg = base00;
+            };
           };
           replace = {
-            a = { fg = base00; bg = base08; gui = "bold"; };
-            b = { fg = base05; bg = base01; };
-            c = { fg = base05; bg = base00; };
+            a = {
+              fg = base00;
+              bg = base08;
+              gui = "bold";
+            };
+            b = {
+              fg = base05;
+              bg = base01;
+            };
+            c = {
+              fg = base05;
+              bg = base00;
+            };
           };
           inactive = {
-            a = { fg = base04; bg = base00; gui = "bold"; };
-            b = { fg = base04; bg = base00; };
-            c = { fg = base04; bg = base00; };
+            a = {
+              fg = base04;
+              bg = base00;
+              gui = "bold";
+            };
+            b = {
+              fg = base04;
+              bg = base00;
+            };
+            c = {
+              fg = base04;
+              bg = base00;
+            };
           };
         };
         icons_enabled = true;
diff --git a/modules/tools/nixvim/plugins/nvim-tree.nix b/modules/tools/nixvim/plugins/nvim-tree.nix
index 813bd30..291946b 100644
--- a/modules/tools/nixvim/plugins/nvim-tree.nix
+++ b/modules/tools/nixvim/plugins/nvim-tree.nix
@@ -8,7 +8,7 @@
         dotfiles = false;
         git_clean = false;
         no_buffer = false;
-        custom = {};
+        custom = { };
       };
       git = {
         enable = true;
diff --git a/modules/tools/nixvim/plugins/treesitter.nix b/modules/tools/nixvim/plugins/treesitter.nix
index 7100ba1..d62d250 100644
--- a/modules/tools/nixvim/plugins/treesitter.nix
+++ b/modules/tools/nixvim/plugins/treesitter.nix
@@ -7,8 +7,12 @@
       enable = true;
     };
     settings = {
-      highlight = { enable = true; };
-      indent = { enable = true; };
+      highlight = {
+        enable = true;
+      };
+      indent = {
+        enable = true;
+      };
     };
   };
 }
diff --git a/modules/tools/nixvim/plugins/which-key.nix b/modules/tools/nixvim/plugins/which-key.nix
index e5b96a5..8b78dcc 100644
--- a/modules/tools/nixvim/plugins/which-key.nix
+++ b/modules/tools/nixvim/plugins/which-key.nix
@@ -7,9 +7,14 @@
       plugins = {
         marks = true;
         registers = true;
-        spelling = { enabled = true; suggestions = 20; };
+        spelling = {
+          enabled = true;
+          suggestions = 20;
+        };
+      };
+      win = {
+        border = "single";
       };
-      win = { border = "single"; };
     };
   };
 }