diff --git a/home-cli.nix b/home-cli.nix index 5eebef2..8f9298f 100644 --- a/home-cli.nix +++ b/home-cli.nix @@ -33,7 +33,6 @@ in eva glow restic - gitui spotify-tui slides manix @@ -229,6 +228,45 @@ in }; }; + programs.gitui = { + enable = true; + keyConfig = ''( + focus_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)), + focus_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)), + focus_above: Some(( code: Char('k'), modifiers: ( bits: 0,),)), + focus_below: Some(( code: Char('j'), modifiers: ( bits: 0,),)), + + open_help: Some(( code: F(1), modifiers: ( bits: 0,),)), + + move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)), + move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)), + move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)), + move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)), + popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)), + popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)), + page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)), + page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)), + home: Some(( code: Char('g'), modifiers: ( bits: 0,),)), + end: Some(( code: Char('G'), modifiers: ( bits: 1,),)), + shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)), + shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)), + + edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)), + + status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)), + + diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)), + diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)), + + stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)), + stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)), + + stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)), + + abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)), + )''; + }; + programs.helix = { enable = true; settings = { @@ -293,42 +331,42 @@ in ''; }; - home.file.gitui = { - target = ".config/gitui/key_bindings.ron"; - text = ''( - focus_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)), - focus_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)), - focus_above: Some(( code: Char('k'), modifiers: ( bits: 0,),)), - focus_below: Some(( code: Char('j'), modifiers: ( bits: 0,),)), + # home.file.gitui = { + # target = ".config/gitui/key_bindings.ron"; + # text = ''( + # focus_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)), + # focus_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)), + # focus_above: Some(( code: Char('k'), modifiers: ( bits: 0,),)), + # focus_below: Some(( code: Char('j'), modifiers: ( bits: 0,),)), - open_help: Some(( code: F(1), modifiers: ( bits: 0,),)), + # open_help: Some(( code: F(1), modifiers: ( bits: 0,),)), - move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)), - move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)), - move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)), - move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)), - popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)), - popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)), - page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)), - page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)), - home: Some(( code: Char('g'), modifiers: ( bits: 0,),)), - end: Some(( code: Char('G'), modifiers: ( bits: 1,),)), - shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)), - shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)), + # move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)), + # move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)), + # move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)), + # move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)), + # popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)), + # popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)), + # page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)), + # page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)), + # home: Some(( code: Char('g'), modifiers: ( bits: 0,),)), + # end: Some(( code: Char('G'), modifiers: ( bits: 1,),)), + # shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)), + # shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)), - edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)), + # edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)), - status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)), + # status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)), - diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)), - diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)), + # diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)), + # diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)), - stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)), - stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)), + # stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)), + # stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)), - stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)), + # stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)), - abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)), -)''; - }; + # abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)), + # )''; + # }; }