mirror of
https://github.com/mitchell/dotfiles.git
synced 2026-08-10 08:09:35 +00:00
chore: add stow to pkgs, ignore fish_variables, fix .gitconfig format
This commit is contained in:
parent
fd32e1431c
commit
341cdd5b9e
3 changed files with 41 additions and 39 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
||||||
.aider*
|
.aider*
|
||||||
|
fish_variables
|
||||||
|
|
|
||||||
|
|
@ -1,53 +1,53 @@
|
||||||
[alias]
|
[alias]
|
||||||
sw = switch
|
sw = switch
|
||||||
rs = restore
|
rs = restore
|
||||||
rss = restore --staged
|
rss = restore --staged
|
||||||
br = branch
|
br = branch
|
||||||
cm = commit
|
cm = commit
|
||||||
st = status
|
st = status
|
||||||
rb = rebase
|
rb = rebase
|
||||||
pfwl = push --force-with-lease
|
pfwl = push --force-with-lease
|
||||||
llog = log --date=local
|
llog = log --date=local
|
||||||
flog = log --pretty=fuller --decorate
|
flog = log --pretty=fuller --decorate
|
||||||
lol = log --graph --decorate --oneline
|
lol = log --graph --decorate --oneline
|
||||||
lola = log --graph --decorate --oneline --all
|
lola = log --graph --decorate --oneline --all
|
||||||
blog = log origin/master... --left-right
|
blog = log origin/master... --left-right
|
||||||
ds = diff --staged
|
ds = diff --staged
|
||||||
amend = commit --amend -C HEAD
|
amend = commit --amend -C HEAD
|
||||||
fixup = commit --fixup
|
fixup = commit --fixup
|
||||||
squash = commit --squash
|
squash = commit --squash
|
||||||
unstage = reset HEAD
|
unstage = reset HEAD
|
||||||
rum = rebase master@{u}
|
rum = rebase master@{u}
|
||||||
puff = pull --ff-only
|
puff = pull --ff-only
|
||||||
merff = merge --ff-only
|
merff = merge --ff-only
|
||||||
fa = fetch --all
|
fa = fetch --all
|
||||||
ap = add --patch
|
ap = add --patch
|
||||||
aa = add --all
|
aa = add --all
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = nvim
|
||||||
pager = delta
|
pager = delta
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
ui = auto
|
ui = auto
|
||||||
branch = auto
|
branch = auto
|
||||||
interactive = auto
|
interactive = auto
|
||||||
status = auto
|
status = auto
|
||||||
|
|
||||||
[push]
|
[push]
|
||||||
default = simple
|
default = simple
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
|
|
||||||
[interactive]
|
[interactive]
|
||||||
diffFilter = delta --color-only
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
[delta]
|
[delta]
|
||||||
navigate = true
|
navigate = true
|
||||||
dark = true
|
dark = true
|
||||||
side-by-side = false
|
side-by-side = false
|
||||||
line-numbers = true
|
line-numbers = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = zdiff3
|
conflictstyle = zdiff3
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,8 @@ set -l base_pkgs \
|
||||||
tree-sitter-cli \
|
tree-sitter-cli \
|
||||||
nodejs \
|
nodejs \
|
||||||
zoxide \
|
zoxide \
|
||||||
git-delta
|
git-delta \
|
||||||
|
stow
|
||||||
|
|
||||||
set -l mac_pkgs \
|
set -l mac_pkgs \
|
||||||
$base_pkgs \
|
$base_pkgs \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue