mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 08:35:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "plugins/neogit: Adapt to upstream options changes"

Browse source 
This reverts commit c490fbe5d9.
This commit is contained in:
Gaetan Lepage 2024-06-21 11:17:24 +02:00 • committed by Gaétan Lepage
parent 22f1c8a246
commit df4d1a24a2
2 changed files with 11 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

42
plugins/git/neogit/options.nix
View file

@ -13,6 +13,10 @@ let
in in
{ {
filewatcher = { filewatcher = {
interval = helpers.defaultNullOpts.mkUnsignedInt 1000 ''
Interval between two refreshes.
'';
enabled = helpers.defaultNullOpts.mkBool true '' enabled = helpers.defaultNullOpts.mkBool true ''
When enabled, will watch the `.git/` directory for changes and refresh the status buffer When enabled, will watch the `.git/` directory for changes and refresh the status buffer
in response to filesystem events. in response to filesystem events.
@ -308,19 +312,9 @@ in
q = "Close"; q = "Close";
"<c-c><c-c>" = "Submit"; "<c-c><c-c>" = "Submit";
"<c-c><c-k>" = "Abort"; "<c-c><c-k>" = "Abort";
"<m-p>" = "PrevMessage";
"<m-n>" = "NextMessage";
"<m-r>" = "ResetMessage";
} }
'' "Mappings for the commit editor."; '' "Mappings for the commit editor.";
commit_editor_I = mkMappingOption ''
{
"<c-c><c-c>" = "Submit";
"<c-c><c-k>" = "Abort";
}
'' "Mappings for the commit editor (insert mode)";
rebase_editor = mkMappingOption '' rebase_editor = mkMappingOption ''
{ {
p = "Pick"; p = "Pick";
@ -337,18 +331,9 @@ in
gj = "MoveDown"; gj = "MoveDown";
"<c-c><c-c>" = "Submit"; "<c-c><c-c>" = "Submit";
"<c-c><c-k>" = "Abort"; "<c-c><c-k>" = "Abort";
"[c" = "OpenOrScrollUp";
"]c" = "OpenOrScrollDown";
} }
'' "Mappings for the rebase editor."; '' "Mappings for the rebase editor.";
rebase_editor_I = mkMappingOption ''
{
"<c-c><c-c>" = "Submit";
"<c-c><c-k>" = "Abort";
}
'' "Mappings for the rebase editor (insert mode).";
finder = mkMappingOption '' finder = mkMappingOption ''
{ {
"<cr>" = "Select"; "<cr>" = "Select";
@ -361,12 +346,6 @@ in
"<tab>" = "MultiselectToggleNext"; "<tab>" = "MultiselectToggleNext";
"<s-tab>" = "MultiselectTogglePrevious"; "<s-tab>" = "MultiselectTogglePrevious";
"<c-j>" = "NOP"; "<c-j>" = "NOP";
"<ScrollWheelDown>" = "ScrollWheelDown";
"<ScrollWheelUp>" = "ScrollWheelUp";
"<ScrollWheelLeft>" = "NOP";
"<ScrollWheelRight>" = "NOP";
"<LeftMouse>" = "MouseClick";
"<2-LeftMouse>" = "NOP";
} }
'' "Mappings for the finder."; '' "Mappings for the finder.";
@ -374,16 +353,12 @@ in
{ {
"?" = "HelpPopup"; "?" = "HelpPopup";
A = "CherryPickPopup"; A = "CherryPickPopup";
d = "DiffPopup"; D = "DiffPopup";
M = "RemotePopup"; M = "RemotePopup";
P = "PushPopup"; P = "PushPopup";
X = "ResetPopup"; X = "ResetPopup";
Z = "StashPopup"; Z = "StashPopup";
i = "IgnorePopup";
t = "TagPopup";
b = "BranchPopup"; b = "BranchPopup";
B = "BisectPopup";
w = "WorktreePopup";
c = "CommitPopup"; c = "CommitPopup";
f = "FetchPopup"; f = "FetchPopup";
l = "LogPopup"; l = "LogPopup";
@ -408,20 +383,17 @@ in
S = "StageUnstaged"; S = "StageUnstaged";
"<c-s>" = "StageAll"; "<c-s>" = "StageAll";
u = "Unstage"; u = "Unstage";
K = "Untrack";
U = "UnstageStaged"; U = "UnstageStaged";
y = "ShowRefs";
"$" = "CommandHistory"; "$" = "CommandHistory";
"#" = "Console";
Y = "YankSelected"; Y = "YankSelected";
"<c-r>" = "RefreshBuffer"; "<c-r>" = "RefreshBuffer";
"<cr>" = "GoToFile"; "<enter>" = "GoToFile";
"<c-v>" = "VSplitOpen"; "<c-v>" = "VSplitOpen";
"<c-x>" = "SplitOpen"; "<c-x>" = "SplitOpen";
"<c-t>" = "TabOpen"; "<c-t>" = "TabOpen";
"{" = "GoToPreviousHunkHeader"; "{" = "GoToPreviousHunkHeader";
"}" = "GoToNextHunkHeader"; "}" = "GoToNextHunkHeader";
"[c" = "OpenOrScrollUp";
"]c" = "OpenOrScrollDown";
} }
'' "Mappings for status."; '' "Mappings for status.";
}; };

33
tests/test-sources/plugins/git/neogit.nix
View file

@ -14,6 +14,7 @@
settings = { settings = {
filewatcher = { filewatcher = {
interval = 1000;
enabled = true; enabled = true;
}; };
graph_style = "ascii"; graph_style = "ascii";
@ -150,13 +151,6 @@
q = "Close"; q = "Close";
"<c-c><c-c>" = "Submit"; "<c-c><c-c>" = "Submit";
"<c-c><c-k>" = "Abort"; "<c-c><c-k>" = "Abort";
"<m-p>" = "PrevMessage";
"<m-n>" = "NextMessage";
"<m-r>" = "ResetMessage";
};
commit_editor_I = {
"<c-c><c-c>" = "Submit";
"<c-c><c-k>" = "Abort";
}; };
rebase_editor = { rebase_editor = {
p = "Pick"; p = "Pick";
@ -173,12 +167,6 @@
gj = "MoveDown"; gj = "MoveDown";
"<c-c><c-c>" = "Submit"; "<c-c><c-c>" = "Submit";
"<c-c><c-k>" = "Abort"; "<c-c><c-k>" = "Abort";
"[c" = "OpenOrScrollUp";
"]c" = "OpenOrScrollDown";
};
rebase_editor_I = {
"<c-c><c-c>" = "Submit";
"<c-c><c-k>" = "Abort";
}; };
finder = { finder = {
"<cr>" = "Select"; "<cr>" = "Select";
@ -191,26 +179,16 @@
"<tab>" = "MultiselectToggleNext"; "<tab>" = "MultiselectToggleNext";
"<s-tab>" = "MultiselectTogglePrevious"; "<s-tab>" = "MultiselectTogglePrevious";
"<c-j>" = "NOP"; "<c-j>" = "NOP";
"<ScrollWheelDown>" = "ScrollWheelDown";
"<ScrollWheelUp>" = "ScrollWheelUp";
"<ScrollWheelLeft>" = "NOP";
"<ScrollWheelRight>" = "NOP";
"<LeftMouse>" = "MouseClick";
"<2-LeftMouse>" = "NOP";
}; };
popup = { popup = {
"?" = "HelpPopup"; "?" = "HelpPopup";
A = "CherryPickPopup"; A = "CherryPickPopup";
d = "DiffPopup"; D = "DiffPopup";
M = "RemotePopup"; M = "RemotePopup";
P = "PushPopup"; P = "PushPopup";
X = "ResetPopup"; X = "ResetPopup";
Z = "StashPopup"; Z = "StashPopup";
i = "IgnorePopup";
t = "TagPopup";
b = "BranchPopup"; b = "BranchPopup";
B = "BisectPopup";
w = "WorktreePopup";
c = "CommitPopup"; c = "CommitPopup";
f = "FetchPopup"; f = "FetchPopup";
l = "LogPopup"; l = "LogPopup";
@ -232,20 +210,17 @@
S = "StageUnstaged"; S = "StageUnstaged";
"<c-s>" = "StageAll"; "<c-s>" = "StageAll";
u = "Unstage"; u = "Unstage";
K = "Untrack";
U = "UnstageStaged"; U = "UnstageStaged";
y = "ShowRefs";
"$" = "CommandHistory"; "$" = "CommandHistory";
"#" = "Console";
Y = "YankSelected"; Y = "YankSelected";
"<c-r>" = "RefreshBuffer"; "<c-r>" = "RefreshBuffer";
"<cr>" = "GoToFile"; "<enter>" = "GoToFile";
"<c-v>" = "VSplitOpen"; "<c-v>" = "VSplitOpen";
"<c-x>" = "SplitOpen"; "<c-x>" = "SplitOpen";
"<c-t>" = "TabOpen"; "<c-t>" = "TabOpen";
"{" = "GoToPreviousHunkHeader"; "{" = "GoToPreviousHunkHeader";
"}" = "GoToNextHunkHeader"; "}" = "GoToNextHunkHeader";
"[c" = "OpenOrScrollUp";
"]c" = "OpenOrScrollDown";
}; };
}; };
notification_icon = "󰊢"; notification_icon = "󰊢";