summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/nixvim.nix36
1 files changed, 12 insertions, 24 deletions
diff --git a/common/nixvim.nix b/common/nixvim.nix
index ba6a8c5..c116ee7 100644
--- a/common/nixvim.nix
+++ b/common/nixvim.nix
@@ -107,8 +107,7 @@ in
107 [ 107 [
108 { 108 {
109 key = "<leader>fu"; 109 key = "<leader>fu";
110 action = "require('telescope').extensions.undo.undo"; 110 action.__raw = "require('telescope').extensions.undo.undo";
111 lua = true;
112 options = { 111 options = {
113 silent = true; 112 silent = true;
114 desc = "Telescope undo"; 113 desc = "Telescope undo";
@@ -117,8 +116,7 @@ in
117 116
118 { 117 {
119 key = "-"; 118 key = "-";
120 action = "require('oil').open"; 119 action.__raw = "require('oil').open";
121 lua = true;
122 options.desc = "Open parent directory"; 120 options.desc = "Open parent directory";
123 } 121 }
124 122
@@ -127,15 +125,13 @@ in
127 # TODO: noremap? buffer local? silent? 125 # TODO: noremap? buffer local? silent?
128 { 126 {
129 key = "<leader>gs"; 127 key = "<leader>gs";
130 action = "require('gitsigns').stage_hunk"; 128 action.__raw = "require('gitsigns').stage_hunk";
131 lua = true;
132 options.desc = "Stage hunk"; 129 options.desc = "Stage hunk";
133 } 130 }
134 131
135 { 132 {
136 key = "<leader>gr"; 133 key = "<leader>gr";
137 action = "require('gitsigns').reset_hunk"; 134 action.__raw = "require('gitsigns').reset_hunk";
138 lua = true;
139 options.desc = "Reset hunk"; 135 options.desc = "Reset hunk";
140 } 136 }
141 137
@@ -143,49 +139,43 @@ in
143 139
144 { 140 {
145 key = "<leader>gS"; 141 key = "<leader>gS";
146 action = "require('gitsigns').stage_buffer"; 142 action.__raw = "require('gitsigns').stage_buffer";
147 lua = true;
148 options.desc = "Stage buffer"; 143 options.desc = "Stage buffer";
149 } 144 }
150 145
151 { 146 {
152 key = "<leader>gR"; 147 key = "<leader>gR";
153 action = "require('gitsigns').reset_buffer"; 148 action.__raw = "require('gitsigns').reset_buffer";
154 lua = true;
155 options.desc = "Stage buffer"; 149 options.desc = "Stage buffer";
156 } 150 }
157 151
158 { 152 {
159 key = "<leader>gu"; 153 key = "<leader>gu";
160 action = "require('gitsigns').undo_stage_hunk"; 154 action.__raw = "require('gitsigns').undo_stage_hunk";
161 lua = true;
162 options.desc = "Undo stage hunk"; 155 options.desc = "Undo stage hunk";
163 } 156 }
164 157
165 { 158 {
166 key = "<leader>gp"; 159 key = "<leader>gp";
167 action = "require('gitsigns').preview_hunk_inline"; 160 action.__raw = "require('gitsigns').preview_hunk_inline";
168 lua = true;
169 options.desc = "Preview hunk"; 161 options.desc = "Preview hunk";
170 } 162 }
171 163
172 { 164 {
173 key = "<leader>gb"; 165 key = "<leader>gb";
174 action = "function() require('gitsigns').blame_line { full = true } end"; 166 action.__raw = "function() require('gitsigns').blame_line { full = true } end";
175 lua = true;
176 options.desc = "Blame line"; 167 options.desc = "Blame line";
177 } 168 }
178 169
179 { 170 {
180 key = "]g"; 171 key = "]g";
181 action = '' 172 action.__raw = ''
182 function() 173 function()
183 if vim.wo.diff then return ']c' end 174 if vim.wo.diff then return ']c' end
184 vim.schedule(function() package.loaded.gitsigns.next_hunk() end) 175 vim.schedule(function() package.loaded.gitsigns.next_hunk() end)
185 return '<Ignore>' 176 return '<Ignore>'
186 end 177 end
187 ''; 178 '';
188 lua = true;
189 options = { 179 options = {
190 expr = true; 180 expr = true;
191 desc = "Next hunk"; 181 desc = "Next hunk";
@@ -194,14 +184,13 @@ in
194 184
195 { 185 {
196 key = "[g"; 186 key = "[g";
197 action = '' 187 action.__raw = ''
198 function() 188 function()
199 if vim.wo.diff then return '[c' end 189 if vim.wo.diff then return '[c' end
200 vim.schedule(function() package.loaded.gitsigns.prev_hunk() end) 190 vim.schedule(function() package.loaded.gitsigns.prev_hunk() end)
201 return '<Ignore>' 191 return '<Ignore>'
202 end 192 end
203 ''; 193 '';
204 lua = true;
205 options = { 194 options = {
206 expr = true; 195 expr = true;
207 desc = "Next hunk"; 196 desc = "Next hunk";
@@ -222,7 +211,7 @@ in
222 { 211 {
223 mode = "n"; 212 mode = "n";
224 key = "yod"; 213 key = "yod";
225 action = '' 214 action.__raw = ''
226 function() 215 function()
227 if vim.wo.diff then 216 if vim.wo.diff then
228 vim.cmd.diffoff() 217 vim.cmd.diffoff()
@@ -233,7 +222,6 @@ in
233 end 222 end
234 end 223 end
235 ''; 224 '';
236 lua = true;
237 options.desc = "Toggle diff"; 225 options.desc = "Toggle diff";
238 } 226 }
239 ]; 227 ];