From c7dc45f3918e80c252f92932d8dabd7f2496b65e Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 11 May 2024 15:29:52 +0200 Subject: git: move tool install/config to git.nix --- user/settings/git.nix | 13 +++++++++++++ user/settings/shell.nix | 14 -------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/user/settings/git.nix b/user/settings/git.nix index e5f4770b..bc43a523 100644 --- a/user/settings/git.nix +++ b/user/settings/git.nix @@ -89,7 +89,20 @@ ".tabnine_root" ]; }; + programs.gh = { + enable = true; + settings = { + git_protocol = "ssh"; + aliases = { + fork = "repo fork --remote --remote-name alanpearce --default-branch-only"; + }; + }; + }; home.packages = with pkgs; [ git-extras # delete-merged-branches and friends + ghq + delta + gitui + gitstatus ]; } diff --git a/user/settings/shell.nix b/user/settings/shell.nix index 3b4bb1f4..5358f618 100644 --- a/user/settings/shell.nix +++ b/user/settings/shell.nix @@ -141,22 +141,8 @@ in sngc = "sudo nix-collect-garbage --delete-older-than 30d"; }; }; - programs.gh = { - enable = true; - settings = { - git_protocol = "ssh"; - aliases = { - fork = "repo fork --remote --remote-name fork --default-branch-only"; - }; - }; - }; home.packages = with pkgs; [ fzf - ghq - delta - git - gitui - gitstatus up ]; } -- cgit 1.4.1