new git working strategy, using worktrees now for easier parallel development

This commit is contained in:
RingOfStorms (Joshua Bell) 2025-09-11 13:49:58 -05:00
parent 186e8db249
commit 951dd38e9d
8 changed files with 320 additions and 385 deletions

View file

@ -25,17 +25,6 @@ with lib;
hdparm
speedtest-cli
lf
# Build script bins from repo scripts
(pkgs.writeShellScriptBin "branch" ''#!/usr/bin/env bash
. ${./branch.sh}
branch "$@"
'')
(pkgs.writeShellScriptBin "branchd" ''#!/usr/bin/env bash
. ${./branch.sh}
branchd "$@"
'')
(pkgs.writeShellScriptBin "link_ignored" (builtins.readFile ./link_ignored.sh))
];
environment.shellAliases = {
@ -64,12 +53,16 @@ branchd "$@"
gcm = "git commit -m";
stashes = "git stash list";
# ripgrep
rg = "rg --no-ignore";
rgf = "rg --files --glob '!/nix/store/**' 2>/dev/null | rg";
};
environment.shellInit = builtins.readFile ./common.sh;
environment.shellInit = lib.concatStringsSep "\n\n" [
(builtins.readFile ./common.sh)
(builtins.readFile ./branch.func.sh)
(builtins.readFile ./branchd.func.sh)
(builtins.readFile ./link_ignored.func.sh)
];
};
}