Merge pull request #28 from redyf/dev

Refactoring
redyf · Jan 31, 2024 · 3ab6510 · 3ab6510
2 parents dc75729 + 24eee16
commit 3ab6510
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/config/git/gitsigns.nix b/config/git/gitsigns.nix
@@ -6,16 +6,7 @@
   };
   keymaps = [
     {
-      mode = "v";
-      key = "<leader>gh";
-      action = "gitsigns";
-      options = {
-        silent = true;
-        desc = "+gitsigns";
-      };
-    }
-    {
-      mode = "n";
+      mode = [ "n" "v" ];
       key = "<leader>gh";
       action = "gitsigns";
       options = {
@@ -26,7 +17,7 @@
     {
       mode = "n";
       key = "<leader>ghb";
-      action = "gitsigns";
+      action = ":Gitsigns blame_line<CR>";
       options = {
         silent = true;
         desc = "Blame line";
@@ -35,7 +26,7 @@
     {
       mode = "n";
       key = "<leader>ghd";
-      action = "Gitsigns diffthis";
+      action = ":Gitsigns diffthis<CR>";
       options = {
         silent = true;
         desc = "Diff This";
@@ -44,7 +35,7 @@
     {
       mode = "n";
       key = "<leader>ghp";
-      action = "Gitsigns preview_hunk";
+      action = ":Gitsigns preview_hunk<CR>";
       options = {
         silent = true;
         desc = "Preview hunk";
@@ -53,7 +44,7 @@
     {
       mode = "n";
       key = "<leader>ghR";
-      action = "Gitsigns reset_buffer";
+      action = ":Gitsigns reset_buffer<CR>";
       options = {
         silent = true;
         desc = "Reset Buffer";
@@ -62,7 +53,7 @@
     {
       mode = [ "n" "v" ];
       key = "<leader>ghr";
-      action = "Gitsigns reset_hunk";
+      action = ":Gitsigns reset_hunk<CR>";
       options = {
         silent = true;
         desc = "Reset Hunk";
@@ -71,7 +62,7 @@
     {
       mode = [ "n" "v" ];
       key = "<leader>ghs";
-      action = "Gitsigns stage_hunk";
+      action = ":Gitsigns stage_hunk<CR>";
       options = {
         silent = true;
         desc = "Stage Hunk";
@@ -80,7 +71,7 @@
     {
       mode = "n";
       key = "<leader>ghS";
-      action = "Gitsigns stage_buffer";
+      action = ":Gitsigns stage_buffer<CR>";
       options = {
         silent = true;
         desc = "Stage Buffer";
@@ -89,7 +80,7 @@
     {
       mode = "n";
       key = "<leader>ghu";
-      action = "Gitsigns undo_stage_hunk";
+      action = ":Gitsigns undo_stage_hunk<CR>";
       options = {
         silent = true;
         desc = "Undo Stage Hunk";

diff --git a/config/statusline/lualine.nix b/config/statusline/lualine.nix
@@ -1,6 +1,3 @@
-let
-  icon = "";
-in
 {
   plugins.lualine = {
     enable = true;

diff --git a/config/telescope/telescope.nix b/config/telescope/telescope.nix
@@ -39,11 +39,11 @@
       };
       "<leader>gc" = {
         action = "git_commits, {}";
-        desc = "commits";
+        desc = "Commits";
       };
       "<leader>gs" = {
         action = "git_status, {}";
-        desc = "status";
+        desc = "Status";
       };
       "<leader>sa" = {
         action = "autocommands, {}";