Compare commits

...

4 Commits

Author SHA1 Message Date
David Morgan e244cf50be
Add checkout-pr function 2023-01-12 12:12:53 +00:00
David Morgan 1a38ff654a
Add tmux-fuzzback plugin 2023-01-12 12:12:25 +00:00
David Morgan 5371b56438
Improve elisp and clojure diffs 2023-01-12 12:12:07 +00:00
David Morgan a6ebfc0dbb
Add ea and some aliases 2023-01-12 12:11:38 +00:00
3 changed files with 17 additions and 0 deletions

View File

@ -30,6 +30,7 @@ in
difftastic difftastic
duf duf
du-dust du-dust
ea
elinks elinks
entr entr
exa exa
@ -206,11 +207,17 @@ in
update-master = "!git fetch origin master:master"; update-master = "!git fetch origin master:master";
update-main = "!git fetch origin main:main"; update-main = "!git fetch origin main:main";
}; };
attributes = [
"*.el diff=elisp"
"*.clj diff=clojure"
];
extraConfig = { extraConfig = {
core.editor = "vim"; core.editor = "vim";
diff = { diff = {
tool = "difftastic"; tool = "difftastic";
colorMoved = "default"; colorMoved = "default";
elisp = { xfuncname = "^\\((((def\\S+)|use-package)\\s+\\S+)"; };
clojure = { xfuncname = "^\\((def\\S+\\s+\\S+)"; };
}; };
difftool = { difftool = {
prompt = false; prompt = false;

View File

@ -23,6 +23,7 @@
tmuxPlugins.copy-toolkit tmuxPlugins.copy-toolkit
tmuxPlugins.copycat tmuxPlugins.copycat
tmuxPlugins.extrakto tmuxPlugins.extrakto
tmuxPlugins.fuzzback
tmuxPlugins.fzf-tmux-url tmuxPlugins.fzf-tmux-url
tmuxPlugins.jump tmuxPlugins.jump
{ {

View File

@ -66,6 +66,10 @@
zz = "z $PWD"; 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 # Git log aliases from the omz git plugin
gl = "git pull"; gl = "git pull";
glg = "git log --stat"; glg = "git log --stat";
@ -188,6 +192,11 @@
df -h 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 ~/.zsh.local ]] || source ~/.zsh.local
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh