From d278e3223b64754a1646f3ccf2c2ec4a1b3e78c8 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sun, 11 Feb 2024 13:23:28 +0300 Subject: [PATCH] Add git-absorb --- modules/git.nix | 13 ++++++++++--- modules/nushell/default.nix | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/git.nix b/modules/git.nix index f57cdb4..69b8391 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -1,12 +1,15 @@ -{ lib, ulib, pkgs, ... }: with ulib; +{ lib, ulib, pkgs, ... }: with ulib; merge -homeConfiguration { +(homeConfiguration { programs.nushell.shellAliases = { g = "git"; ga = "git add"; gaa = "git add ./"; + gab = "git absorb"; + gabr = "git absorb --and-rebase"; + gb = "git branch"; gbv = "git branch --verbose"; @@ -88,4 +91,8 @@ homeConfiguration { user.signingKey = "~/.ssh/id"; }; }; -} +}) + +(systemPackages (with pkgs; [ + git-absorb +])) diff --git a/modules/nushell/default.nix b/modules/nushell/default.nix index 3960191..7f6759e 100644 --- a/modules/nushell/default.nix +++ b/modules/nushell/default.nix @@ -41,6 +41,6 @@ }; }) -(homePackages (with pkgs; [ +(systemPackages (with pkgs; [ fish # For completions. ]))