Compare commits
4 Commits
d1cb6ec11b
...
e244cf50be
Author | SHA1 | Date |
---|---|---|
David Morgan | e244cf50be | |
David Morgan | 1a38ff654a | |
David Morgan | 5371b56438 | |
David Morgan | a6ebfc0dbb |
|
@ -30,6 +30,7 @@ in
|
|||
difftastic
|
||||
duf
|
||||
du-dust
|
||||
ea
|
||||
elinks
|
||||
entr
|
||||
exa
|
||||
|
@ -206,11 +207,17 @@ in
|
|||
update-master = "!git fetch origin master:master";
|
||||
update-main = "!git fetch origin main:main";
|
||||
};
|
||||
attributes = [
|
||||
"*.el diff=elisp"
|
||||
"*.clj diff=clojure"
|
||||
];
|
||||
extraConfig = {
|
||||
core.editor = "vim";
|
||||
diff = {
|
||||
tool = "difftastic";
|
||||
colorMoved = "default";
|
||||
elisp = { xfuncname = "^\\((((def\\S+)|use-package)\\s+\\S+)"; };
|
||||
clojure = { xfuncname = "^\\((def\\S+\\s+\\S+)"; };
|
||||
};
|
||||
difftool = {
|
||||
prompt = false;
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
tmuxPlugins.copy-toolkit
|
||||
tmuxPlugins.copycat
|
||||
tmuxPlugins.extrakto
|
||||
tmuxPlugins.fuzzback
|
||||
tmuxPlugins.fzf-tmux-url
|
||||
tmuxPlugins.jump
|
||||
{
|
||||
|
|
|
@ -66,6 +66,10 @@
|
|||
|
||||
zz = "z $PWD";
|
||||
|
||||
els = "ea run linear ls -- -1";
|
||||
erg = "ea run grouped rg --";
|
||||
fd = "ea run linear fd --";
|
||||
|
||||
# Git log aliases from the omz git plugin
|
||||
gl = "git pull";
|
||||
glg = "git log --stat";
|
||||
|
@ -188,6 +192,11 @@
|
|||
df -h
|
||||
}
|
||||
|
||||
function checkout-pr () {
|
||||
git fetch ''${2:-upstream} pull/''${1}/head:pr-''${1}
|
||||
git switch pr-''${1}
|
||||
}
|
||||
|
||||
[[ ! -f ~/.zsh.local ]] || source ~/.zsh.local
|
||||
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
|
Loading…
Reference in New Issue