diff --git a/home/applications/fish/default.nix b/home/applications/fish/default.nix index a1ac7ec..d91bca3 100644 --- a/home/applications/fish/default.nix +++ b/home/applications/fish/default.nix @@ -42,7 +42,7 @@ }; in { - gi = "gitui"; + gi = "lazygit"; p = "powerprofilesctl"; s = "nh os switch"; v = "nvim"; diff --git a/home/applications/git/default.nix b/home/applications/git/default.nix index f6704e3..aad2abe 100644 --- a/home/applications/git/default.nix +++ b/home/applications/git/default.nix @@ -19,21 +19,18 @@ }; programs.gh.enable = true; - programs.gitui.enable = true; - # vim keybinds - # https://github.com/extrawurst/gitui/blob/master/KEY_CONFIG.md - programs.gitui.keyConfig = '' - ( - 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: "")), - - stash_open: Some(( code: Char('l'), modifiers: "")), - open_help: Some(( code: F(1), modifiers: "")), - - status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")), - ) - ''; + programs.lazygit = { + enable = true; + settings = { + gui = { + nerdFontsVersion = "3"; + showRandomTip = false; + showBottomLine = false; + }; + git = { + paging.pager = "delta --paging=never"; + }; + }; + }; }