Skip to content

Commit 70ab62c

Browse files
cseickelcseickel
authored
fix: remove sort commands from global mappings, disable created column (#1113)
1 parent 0f22edc commit 70ab62c

File tree

2 files changed

+50
-20
lines changed

2 files changed

+50
-20
lines changed

‎README.md‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ This screenshot shows Neo-tree opened in the traditional sidebar layout:
1010

1111
![Neo-tree file system sidebar](https://github.com/nvim-neo-tree/resources/blob/main/images/Neo-tree-with-right-aligned-symbols.png)
1212

13-
### Neo-tree filesystem as Split
13+
### Neo-tree filesystem Netrw Style
1414

15-
The below screenshot shows Neo-tree opened as a normal split (`:Neo-tree position=current`). When opened in this way,
15+
The below screenshot shows Neo-tree opened "netrw style" (`:Neo-tree position=current`). When opened in this way,
1616
there is more room so the extra detail columns can be shown. This screenshot also shows how the contents can be
1717
sorted on any column. In this example, we are sorted on "Size" descending:
1818

@@ -283,13 +283,6 @@ use {
283283
["<"] = "prev_source",
284284
[">"] = "next_source",
285285
["i"] = "show_file_details",
286-
["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }},
287-
["oc"] = { "order_by_created", nowait = false },
288-
["od"] = { "order_by_diagnostics", nowait = false },
289-
["om"] = { "order_by_modified", nowait = false },
290-
["on"] = { "order_by_name", nowait = false },
291-
["os"] = { "order_by_size", nowait = false },
292-
["ot"] = { "order_by_type", nowait = false },
293286
}
294287
},
295288
nesting_rules = {},
@@ -343,6 +336,13 @@ use {
343336
["<c-x>"] = "clear_filter",
344337
["[g"] = "prev_git_modified",
345338
["]g"] = "next_git_modified",
339+
["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }},
340+
["oc"] = { "order_by_created", nowait = false },
341+
["od"] = { "order_by_diagnostics", nowait = false },
342+
["om"] = { "order_by_modified", nowait = false },
343+
["on"] = { "order_by_name", nowait = false },
344+
["os"] = { "order_by_size", nowait = false },
345+
["ot"] = { "order_by_type", nowait = false },
346346
},
347347
fuzzy_finder_mappings = { -- define keymaps for filter popup window in fuzzy_finder_mode
348348
["<down>"] = "move_cursor_down",
@@ -367,6 +367,13 @@ use {
367367
["bd"] = "buffer_delete",
368368
["<bs>"] = "navigate_up",
369369
["."] = "set_root",
370+
["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }},
371+
["oc"] = { "order_by_created", nowait = false },
372+
["od"] = { "order_by_diagnostics", nowait = false },
373+
["om"] = { "order_by_modified", nowait = false },
374+
["on"] = { "order_by_name", nowait = false },
375+
["os"] = { "order_by_size", nowait = false },
376+
["ot"] = { "order_by_type", nowait = false },
370377
}
371378
},
372379
},
@@ -381,6 +388,13 @@ use {
381388
["gc"] = "git_commit",
382389
["gp"] = "git_push",
383390
["gg"] = "git_commit_and_push",
391+
["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }},
392+
["oc"] = { "order_by_created", nowait = false },
393+
["od"] = { "order_by_diagnostics", nowait = false },
394+
["om"] = { "order_by_modified", nowait = false },
395+
["on"] = { "order_by_name", nowait = false },
396+
["os"] = { "order_by_size", nowait = false },
397+
["ot"] = { "order_by_type", nowait = false },
384398
}
385399
}
386400
}

‎lua/neo-tree/defaults.lua‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,15 @@ local config = {
241241
},
242242
type = {
243243
enabled = true,
244-
required_width = 122, -- min width of window required to show this column
244+
required_width = 110, -- min width of window required to show this column
245245
},
246246
last_modified = {
247247
enabled = true,
248248
required_width = 88, -- min width of window required to show this column
249249
},
250250
created = {
251-
enabled = true,
252-
required_width = 110, -- min width of window required to show this column
251+
enabled = false,
252+
required_width = 120, -- min width of window required to show this column
253253
},
254254
},
255255
renderers = {
@@ -397,14 +397,6 @@ local config = {
397397
["?"] = "show_help",
398398
["<"] = "prev_source",
399399
[">"] = "next_source",
400-
["i"] = "show_file_details",
401-
["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }},
402-
["oc"] = { "order_by_created", nowait = false },
403-
["od"] = { "order_by_diagnostics", nowait = false },
404-
["om"] = { "order_by_modified", nowait = false },
405-
["on"] = { "order_by_name", nowait = false },
406-
["os"] = { "order_by_size", nowait = false },
407-
["ot"] = { "order_by_type", nowait = false },
408400
},
409401
},
410402
filesystem = {
@@ -422,6 +414,14 @@ local config = {
422414
["."] = "set_root",
423415
["[g"] = "prev_git_modified",
424416
["]g"] = "next_git_modified",
417+
["i"] = "show_file_details",
418+
["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }},
419+
["oc"] = { "order_by_created", nowait = false },
420+
["od"] = { "order_by_diagnostics", nowait = false },
421+
["om"] = { "order_by_modified", nowait = false },
422+
["on"] = { "order_by_name", nowait = false },
423+
["os"] = { "order_by_size", nowait = false },
424+
["ot"] = { "order_by_type", nowait = false },
425425
},
426426
fuzzy_finder_mappings = { -- define keymaps for filter popup window in fuzzy_finder_mode
427427
["<down>"] = "move_cursor_down",
@@ -536,6 +536,14 @@ local config = {
536536
["<bs>"] = "navigate_up",
537537
["."] = "set_root",
538538
["bd"] = "buffer_delete",
539+
["i"] = "show_file_details",
540+
["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }},
541+
["oc"] = { "order_by_created", nowait = false },
542+
["od"] = { "order_by_diagnostics", nowait = false },
543+
["om"] = { "order_by_modified", nowait = false },
544+
["on"] = { "order_by_name", nowait = false },
545+
["os"] = { "order_by_size", nowait = false },
546+
["ot"] = { "order_by_type", nowait = false },
539547
},
540548
},
541549
},
@@ -549,6 +557,14 @@ local config = {
549557
["gc"] = "git_commit",
550558
["gp"] = "git_push",
551559
["gg"] = "git_commit_and_push",
560+
["i"] = "show_file_details",
561+
["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }},
562+
["oc"] = { "order_by_created", nowait = false },
563+
["od"] = { "order_by_diagnostics", nowait = false },
564+
["om"] = { "order_by_modified", nowait = false },
565+
["on"] = { "order_by_name", nowait = false },
566+
["os"] = { "order_by_size", nowait = false },
567+
["ot"] = { "order_by_type", nowait = false },
552568
},
553569
},
554570
},

0 commit comments

Comments
 (0)