Fix gitui config

alexherbo2 · Apr 9, 2021 · de5f691 · de5f691
1 parent 8be0221
commit de5f691
Show file tree

Hide file tree

Showing 3 changed files with 242 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ home/thelounge/logs
 home/thelounge/packages
 home/thelounge/users
 home/thelounge/vapid.json
-config/gitui/theme.ron
 config/kak/autoload/plugins
 config/snippets/base
 config/broot/launcher

diff --git a/config/gitui/key_config.ron b/config/gitui/key_config.ron
@@ -3,7 +3,53 @@
 //
 // Keys: https://docs.rs/crossterm/latest/crossterm/event/enum.KeyCode.html
 
+// Modified keys:
+// [hjkl]
+// [g]
+
 (
+  tab_status: (
+    code: Char('1'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  tab_log: (
+    code: Char('2'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  tab_stashing: (
+    code: Char('3'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  tab_stashes: (
+    code: Char('4'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  tab_toggle: (
+    code: Tab,
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  tab_toggle_reverse: (
+    code: BackTab,
+    modifiers: (
+      bits: 1,
+    ),
+  ),
+  toggle_workarea: (
+    code: Char('w'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
   focus_right: (
     code: Char('l'),
     modifiers: (
@@ -28,6 +74,30 @@
       bits: 0,
     ),
   ),
+  exit: (
+    code: Char('c'),
+    modifiers: (
+      bits: 2,
+    ),
+  ),
+  exit_popup: (
+    code: Esc,
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  open_commit: (
+    code: Char('c'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  open_commit_editor: (
+    code: Char('e'),
+    modifiers: (
+      bits: 2,
+    ),
+  ),
   open_help: (
     code: F(1),
     modifiers: (
@@ -70,6 +140,18 @@
       bits: 0,
     ),
   ),
+  page_down: (
+    code: PageDown,
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  page_up: (
+    code: PageUp,
+    modifiers: (
+      bits: 0,
+    ),
+  ),
   shift_up: (
     code: Char('K'),
     modifiers: (
@@ -82,10 +164,148 @@
       bits: 1,
     ),
   ),
+  enter: (
+    code: Enter,
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  edit_file: (
+    code: Char('e'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  status_stage_all: (
+    code: Char('a'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  status_reset_item: (
+    code: Char('D'),
+    modifiers: (
+      bits: 1,
+    ),
+  ),
+  status_ignore_file: (
+    code: Char('i'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  diff_stage_lines: (
+    code: Char('s'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  diff_reset_lines: (
+    code: Char('d'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  stashing_save: (
+    code: Char('s'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  stashing_toggle_untracked: (
+    code: Char('u'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  stashing_toggle_index: (
+    code: Char('i'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
   stash_open: (
     code: Char('l'),
     modifiers: (
       bits: 0,
     ),
   ),
+  stash_drop: (
+    code: Char('D'),
+    modifiers: (
+      bits: 1,
+    ),
+  ),
+  cmd_bar_toggle: (
+    code: Char('.'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  log_tag_commit: (
+    code: Char('t'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  commit_amend: (
+    code: Char('a'),
+    modifiers: (
+      bits: 2,
+    ),
+  ),
+  copy: (
+    code: Char('y'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  create_branch: (
+    code: Char('c'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  rename_branch: (
+    code: Char('r'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  select_branch: (
+    code: Char('b'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  delete_branch: (
+    code: Char('D'),
+    modifiers: (
+      bits: 1,
+    ),
+  ),
+  toggle_remote_branches: (
+    code: Char('t'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  push: (
+    code: Char('p'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
+  force_push: (
+    code: Char('P'),
+    modifiers: (
+      bits: 1,
+    ),
+  ),
+  pull: (
+    code: Char('f'),
+    modifiers: (
+      bits: 0,
+    ),
+  ),
 )
diff --git a/config/gitui/theme.ron b/config/gitui/theme.ron
@@ -0,0 +1,22 @@
+// gitui
+// https://github.com/extrawurst/gitui
+
+(
+  selected_tab: Yellow,
+  command_fg: White,
+  selection_bg: Blue,
+  cmdbar_extra_lines_bg: Blue,
+  disabled_fg: DarkGray,
+  diff_line_add: Green,
+  diff_line_delete: Red,
+  diff_file_added: LightGreen,
+  diff_file_removed: LightRed,
+  diff_file_moved: LightMagenta,
+  diff_file_modified: Yellow,
+  commit_hash: Magenta,
+  commit_time: LightCyan,
+  commit_author: Green,
+  danger_fg: Red,
+  push_gauge_bg: Blue,
+  push_gauge_fg: Reset,
+)