punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(home): Don't define top-level options under programs.git

Browse source
This commit is contained in:
punkfairie 2024-11-16 23:42:55 -08:00
parent 465a717669
commit a5c7443464
Signed by: punkfairie
GPG key ID: A509E8F77FB9D696
1 changed files with 71 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
modules/home/programs/git/default.nix
View file

@ -17,7 +17,6 @@ in
]; ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
gum gum
clipboard-jh clipboard-jh
@ -180,88 +179,88 @@ in
credential.helper = "store"; credential.helper = "store";
}; };
};
# ███╗ ███╗██╗███████╗ ██████╗ # ███╗ ███╗██╗███████╗ ██████╗
# ████╗ ████║██║██╔════╝██╔════╝ # ████╗ ████║██║██╔════╝██╔════╝
# ██╔████╔██║██║███████╗██║ # ██╔████╔██║██║███████╗██║
# ██║╚██╔╝██║██║╚════██║██║ # ██║╚██╔╝██║██║╚════██║██║
# ██║ ╚═╝ ██║██║███████║╚██████╗ # ██║ ╚═╝ ██║██║███████║╚██████╗
# ╚═╝ ╚═╝╚═╝╚══════╝ ╚═════╝ # ╚═╝ ╚═╝╚═╝╚══════╝ ╚═════╝
home.shellAbbrs = { home.shellAbbrs = {
g = "git"; g = "git";
}; };
programs.fish.functions = lib.mkIf config.programs.fish.enable { programs.fish.functions = lib.mkIf config.programs.fish.enable {
git_develop_branch = # fish git_develop_branch = # fish
'' ''
command git rev-parse --git-dir &>/dev/null || return command git rev-parse --git-dir &>/dev/null || return
set -l branch set -l branch
for branch in dev devel develop development for branch in dev devel develop development
if command git show-ref -q --verify refs/heads/$branch if command git show-ref -q --verify refs/heads/$branch
echo $branch echo $branch
return 0 return 0
end
end
echo develop
return 1
'';
git_main_branch = # fish
''
command git rev-parse --git-dir &>/dev/null || return
set -l ref
for ref in
refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default,master}
if command git show-ref -q --verify $ref
echo (basename $ref)
return 0
end end
end end
echo develop echo main
return 1 return 1
''; '';
git_main_branch = # fish git_current_branch = # fish
'' ''
command git rev-parse --git-dir &>/dev/null || return set -l ref (git symbolic-ref --quiet HEAD 2>/dev/null)
set -l ref set -l ret $status
for ref in if [ $ret -ne 0 ]
refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default,master} [ $ret -eq 128 ] && return # no git repo
if command git show-ref -q --verify $ref set ref (git rev-parse --short HEAD 2>/dev/null) || return
echo (basename $ref) end
return 0
end
end
echo main echo (string replace "refs/heads/" "" $ref)
return 1 '';
'';
git_current_branch = # fish git_open = # fish
'' ''
set -l ref (git symbolic-ref --quiet HEAD 2>/dev/null) set -f origin "$(git remote get-url origin)"
set -l ret $status
if [ $ret -ne 0 ] switch "$origin"
[ $ret -eq 128 ] && return # no git repo case "*github*"
set ref (git rev-parse --short HEAD 2>/dev/null) || return if command -v gh &>/dev/null
end gh repo view --web &>/dev/null
else
echo (string replace "refs/heads/" "" $ref) set_color red
''; echo "[ERROR] Install gh-cli to open Github repos." >&2
set_color normal
git_open = # fish return 1
'' end
set -f origin "$(git remote get-url origin)" case "https://*"
open '$origin' >/dev/null &
switch "$origin" case "*"
case "*github*" set_color red
if command -v gh &>/dev/null printf "[ERROR] Unrecognized origin %s" "$origin" >&2
gh repo view --web &>/dev/null return 1
else end
set_color red '';
echo "[ERROR] Install gh-cli to open Github repos." >&2
set_color normal
return 1
end
case "https://*"
open '$origin' >/dev/null &
case "*"
set_color red
printf "[ERROR] Unrecognized origin %s" "$origin" >&2
return 1
end
'';
};
}; };
}; };
} }