Update README.md

README.md

@@ -35,4 +35,4 @@ nix run git+https://git.sajenim.dev/jasmine/nvim.nix.git
 
 ## References
 * [dc-tec/nixvim](https://github.com/dc-tec/nixvim)
-
+* [elythh/nixvim](https://github.com/elythh/nixvim)

config/plugins/git/gitsigns.nix

@@ -4,5 +4,107 @@
   plugins.gitsigns = {
     enable = true;
   };
+
+  keymaps = [
+    {
+      mode = [ "n" "v" ];
+      key = "<leader>hs";
+      action = "<cmd>Gitsigns stage_hunk<cr>";
+      options = {
+        silent = true;
+        desc = "Stage Hunk";
+      };
+    }
+
+    {
+      mode = [ "n" "v" ];
+      key = "<leader>hr";
+      action = "<cmd>Gitsigns reset_hunk<cr>";
+      options = {
+        silent = true;
+        desc = "Reset Hunk";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>hS";
+      action = "<cmd>Gitsigns stage_buffer<cr>";
+      options = {
+        silent = true;
+        desc = "Stage Buffer";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>hu";
+      action = "<cmd>Gitsigns undo_stage_hunk<cr>";
+      options = {
+        silent = true;
+        desc = "Undo Staged Hunk";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>hR";
+      action = "<cmd>Gitsigns reset_buffer<cr>";
+      options = {
+        silent = true;
+        desc = "Reset Buffer";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>hp";
+      action = "<cmd>Gitsigns preview_hunk_inline<cr>";
+      options = {
+        silent = true;
+        desc = "Preview Hunk";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>hb";
+      action = "<cmd>Gitsigns blame<cr>";
+      options = {
+        silent = true;
+        desc = "View Blame";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>tb";
+      action = "<cmd>Gitsigns toggle_current_line_blame<cr>";
+      options = {
+        silent = true;
+        desc = "Toggle Blame";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>hd";
+      action = "<cmd>Gitsigns diffthis<cr>";
+      options = {
+        silent = true;
+        desc = "View Diff";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>td";
+      action = "<cmd>Gitsigns toggle_deleted<cr>";
+      options = {
+        silent = true;
+        desc = "Toggle Deleted";
+      };
+    }
+  ];
 }
 

config/plugins/ui/lualine.nix

@@ -16,7 +16,11 @@
     sectionSeparators = { left = ""; right = ""; };
 
     # Display components in tabline
-    tabline.lualine_a = [ { name = "buffers"; } ];
+    tabline = {
+      lualine_a = [ { name = "buffers"; } ];
+      lualine_x = [ { name = "hostname"; } ];
+      lualine_z = [ { name = "encoding"; } ];
+    };
 
     # Lualine has sections as shown below
     # +-------------------------------------------------+
@@ -24,7 +28,7 @@
     # +-------------------------------------------------+
     sections = {
       # Section A
-      lualine_a = [ { name = "mode"; icon = ""; } ];
+      lualine_a = [ { name = "mode"; } ];
 
       # Section B
       lualine_b = [
@@ -34,34 +38,30 @@
         # Git diff status
         { name = "diff";
           extraConfig.symbols = {
-            added = " ";
+            added = "+";
-            modified = " ";
+            modified = "~";
-            removed = " ";
+            removed = "-";
-          };
-        }
-
-        # Diagnostic count from nvim_lsp
-        { name = "diagnostics";
-          extraConfig = {
-            sources = [ "nvim_lsp" ];
-            symbols = {
-              error = " ";
-              warn = " ";
-              info = " ";
-              hint = "󰝶 ";
-            };
           };
         }
       ];
 
       # Section C
-      lualine_c = [ { name = "filename"; extraConfig = { path = 1; }; } ];
+      lualine_c = [ { name = "filename"; } ];
 
       # Section X
       lualine_x = [
-        { name = "encoding"; }
+        # Diagnostic count from nvim_lsp
-        { name = "fileformat"; }
+        { name = "diagnostics";
-        { name = "filetype"; }
+          extraConfig = {
+            sources = [ "nvim_lsp" ];
+            symbols = {
+              error = "error:";
+              warn = "warning:";
+              info = "info:";
+              hint = "hint:";
+            };
+          };
+        }
       ];
 
       # Section Y

config/plugins/utils/neoclip.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+  extraPlugins = [(pkgs.vimUtils.buildVimPlugin {
+    name = "neoclip";
+    src = pkgs.fetchFromGitHub {
+      owner = "AckslD";
+      repo = "nvim-neoclip.lua";
+      rev = "709c97f";
+      hash = "sha256-8ZPmxVM4dzjJxAYUHRMCiAQBxZEGHtsgSCNlCZBRBWo=";
+    };
+  })];
+
+  extraConfigLua = "require('neoclip').setup({
+    default_register = {'\"', '+'}
+  })";
+}
+

config/plugins/utils/software-licenses.nix

@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  extraPlugins = [(pkgs.vimUtils.buildVimPlugin {
+    name = "software-licenses";
+    src = pkgs.fetchFromGitHub {
+      owner = "chip";
+      repo = "telescope-software-licenses.nvim";
+      rev = "fb5fc33";
+      hash = "sha256-luyCjkZSm1F6qoRpP5hHRAx4632u6JFuX2s7m2s8y60=";
+    };
+  })];
+}
+

config/plugins/utils/telescope.nix

@@ -1,17 +1,63 @@
 { ... }:
 
 {
+  imports = [
+    ./neoclip.nix           # Persistent clipboard.
+    ./software-licenses.nix # View common software licenses.
+  ];
+
   plugins.telescope = {
     enable = true;
 
+    # Install some telescope extensions.
+    extensions = {
+      # Enable native fuzzy finder.
+      fzf-native = {
+        enable = true;
+      };
+    };
+
+    # Configure our telescope keymaps.
     keymaps = {
       "<leader>ff" = {
         action = "find_files";
-        options.desc = "Find Files";
+        options = {
+          desc = "Find project files";
+        };
       };
       "<leader>fb" = {
         action = "buffers";
-        options.desc = "Buffers";
+        options = {
+          desc = "Find open buffers";
+        };
+      };
+      "<leader>/" = {
+        action = "live_grep";
+        options = {
+          desc = "Grep (root dir)";
+        };
+      };
+      "<leader>:" = {
+        action = "command_history";
+        options = {
+          desc = "Command History";
+        };
+      };
+      "<leader>p" = {
+        action = "neoclip";
+        options.desc = "Persistent Clipboard";
+      };
+      "<leader>sc" = {
+        action = "commands";
+        options = {
+          desc = "Search Commands";
+        };
+      };
+      "<leader>sl" = {
+        action = "software-licenses find";
+        options = {
+          desc = "Search Software Licenses";
+        };
       };
     };
   };