diff --git a/.gitignore b/.gitignore index b0ac3ed..0a13a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .aider* +fish_variables diff --git a/git/.gitconfig b/git/.gitconfig index 6f96709..33fbfd9 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,53 +1,53 @@ [alias] - sw = switch - rs = restore - rss = restore --staged - br = branch - cm = commit - st = status - rb = rebase - pfwl = push --force-with-lease - llog = log --date=local - flog = log --pretty=fuller --decorate - lol = log --graph --decorate --oneline - lola = log --graph --decorate --oneline --all - blog = log origin/master... --left-right - ds = diff --staged - amend = commit --amend -C HEAD - fixup = commit --fixup - squash = commit --squash - unstage = reset HEAD - rum = rebase master@{u} - puff = pull --ff-only - merff = merge --ff-only - fa = fetch --all - ap = add --patch - aa = add --all + sw = switch + rs = restore + rss = restore --staged + br = branch + cm = commit + st = status + rb = rebase + pfwl = push --force-with-lease + llog = log --date=local + flog = log --pretty=fuller --decorate + lol = log --graph --decorate --oneline + lola = log --graph --decorate --oneline --all + blog = log origin/master... --left-right + ds = diff --staged + amend = commit --amend -C HEAD + fixup = commit --fixup + squash = commit --squash + unstage = reset HEAD + rum = rebase master@{u} + puff = pull --ff-only + merff = merge --ff-only + fa = fetch --all + ap = add --patch + aa = add --all [core] - editor = nvim - pager = delta + editor = nvim + pager = delta [color] - ui = auto - branch = auto - interactive = auto - status = auto + ui = auto + branch = auto + interactive = auto + status = auto [push] - default = simple + default = simple [pull] - rebase = true + rebase = true [interactive] - diffFilter = delta --color-only + diffFilter = delta --color-only [delta] - navigate = true - dark = true - side-by-side = false - line-numbers = true + navigate = true + dark = true + side-by-side = false + line-numbers = true [merge] - conflictstyle = zdiff3 + conflictstyle = zdiff3 diff --git a/install_utils b/install_utils index 1ee6e57..c22b920 100755 --- a/install_utils +++ b/install_utils @@ -22,7 +22,8 @@ set -l base_pkgs \ tree-sitter-cli \ nodejs \ zoxide \ - git-delta + git-delta \ + stow set -l mac_pkgs \ $base_pkgs \