From 90b5b48d2a5fa286078d89905eee9a742cf1b651 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Fri, 3 Jan 2025 19:22:16 +0100 Subject: [PATCH] vcs: remove unused lazyjj, gitui --- files/config/fish/vcs.fish | 10 ---------- home/common/vcs.nix | 38 -------------------------------------- 2 files changed, 48 deletions(-) diff --git a/files/config/fish/vcs.fish b/files/config/fish/vcs.fish index 4859d3b..f3c179e 100644 --- a/files/config/fish/vcs.fish +++ b/files/config/fish/vcs.fish @@ -53,15 +53,6 @@ function vcs_log commandline -f repaint end -function vcs_ui - if __jj_in_repo - lazyjj - else - gitui - end - commandline -f repaint -end - # Abbreviations abbr -a d vcs_diff @@ -71,6 +62,5 @@ abbr -a s vcs_status bind \c_ vcs_jump bind \ea vcs_log bind \ee vcs_broot -bind \eg vcs_ui bind \eS vcs_diff bind \es vcs_status diff --git a/home/common/vcs.nix b/home/common/vcs.nix index 17f1fb4..956612a 100644 --- a/home/common/vcs.nix +++ b/home/common/vcs.nix @@ -7,7 +7,6 @@ difftastic git-get git-graph - lazyjj tea ]; @@ -130,43 +129,6 @@ }; }; - programs.gitui = { - enable = true; - keyConfig = '' - ( - open_help: Some(( code: F(1), modifiers: "")), - move_left: Some(( code: Char('h'), modifiers: "")), - move_right: Some(( code: Char('l'), modifiers: "")), - move_up: Some(( code: Char('k'), modifiers: "")), - move_down: Some(( code: Char('j'), modifiers: "")), - popup_up: Some(( code: Char('p'), modifiers: "CONTROL")), - popup_down: Some(( code: Char('n'), modifiers: "CONTROL")), - page_up: Some(( code: Char('b'), modifiers: "CONTROL")), - page_down: Some(( code: Char('f'), modifiers: "CONTROL")), - home: Some(( code: Char('g'), modifiers: "")), - end: Some(( code: Char('G'), modifiers: "SHIFT")), - shift_up: Some(( code: Char('K'), modifiers: "SHIFT")), - shift_down: Some(( code: Char('J'), modifiers: "SHIFT")), - edit_file: Some(( code: Char('I'), modifiers: "SHIFT")), - status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")), - diff_reset_lines: Some(( code: Char('u'), modifiers: "")), - diff_stage_lines: Some(( code: Char('s'), modifiers: "")), - stashing_save: Some(( code: Char('w'), modifiers: "")), - stashing_toggle_index: Some(( code: Char('m'), modifiers: "")), - stash_open: Some(( code: Char('l'), modifiers: "")), - abort_merge: Some(( code: Char('M'), modifiers: "SHIFT")), - ) - ''; - theme = '' - ( - selection_bg: Some(Black), - selection_fg: Some(Reset), - cmdbar_bg: Some(Reset), - cmdbar_extra_lines_bg: Some(Reset), - ) - ''; - }; - programs.jujutsu = { enable = true; package = inputs.jujutsu.packages.${pkgs.system}.default;