Compare commits

..

No commits in common. "e244cf50be5ef02d988889818ae283f4fe6c944e" and "d1cb6ec11b1abe014915b662b50bded9bb64794d" have entirely different histories.

3 changed files with 0 additions and 17 deletions

View File

@ -30,7 +30,6 @@ in
difftastic
duf
du-dust
ea
elinks
entr
exa
@ -207,17 +206,11 @@ 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;

View File

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

View File

@ -66,10 +66,6 @@
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";
@ -192,11 +188,6 @@
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