Compare commits

..

5 Commits

Author SHA1 Message Date
59b2334253 readme: Added more tools 2025-09-07 05:26:23 +02:00
17a23eb7e4 zsh: Disable dirhistory plugin as I never used it 2025-09-07 05:26:20 +02:00
9a76b5071e git: Further improvements to git fixup 2025-09-07 05:26:17 +02:00
02d298a163 zsh: Configure fzf
It is now setup to look very similar to telescope.
It now uses fd for finding files.

There is a shell function `pi` to search for packages using fzf and to
then install them with paru
2025-09-07 05:26:13 +02:00
87359588e0 zsh: Added zoxide 2025-09-07 05:26:08 +02:00
5 changed files with 24 additions and 7 deletions

View File

@@ -4,10 +4,12 @@
``` ```
bat bat
git-delta
fd fd
rg
fzf fzf
git-delta
paru
rg
zoxide
``` ```
### Useful ### Useful

View File

@@ -1,2 +0,0 @@
[alias]
fixup = "!f() { TARGET=$(git log -n 50 --pretty=format:'%h %s' --no-merges | fzf | cut -c -7 ); git commit --fixup=$TARGET ${@:2} && GIT_SEQUENCE_EDITOR=true git rebase -i --autostash --autosquash $TARGET^; }; f"

View File

@@ -1,7 +1,6 @@
[include] [include]
path = ~/.dotfiles/git/configs/lfs.gitconfig path = ~/.dotfiles/git/configs/lfs.gitconfig
path = ~/.dotfiles/git/configs/delta.gitconfig path = ~/.dotfiles/git/configs/delta.gitconfig
path = ~/.dotfiles/git/configs/alias.gitconfig
[push] [push]
default = simple default = simple

19
git/dot-local/bin/git-fixup Executable file
View File

@@ -0,0 +1,19 @@
#!/usr/bin/env bash
TARGET=$1
if [ -z "$TARGET" ]; then
if hash fzf 2>/dev/null; then
TARGET=$(git log -n 50 --pretty=format:'%h %s' --no-merges | fzf --border-label='Select commit' | cut -c -7 )
else
echo "Not installed: fzf"
exit -1
fi
fi
if [ -z "$TARGET" ]; then
echo "No target specified"
exit -1
fi
git commit --fixup=$TARGET ${@:2} && GIT_SEQUENCE_EDITOR=true git rebase -i --autostash --autosquash $TARGET^

View File

@@ -25,7 +25,6 @@ plugins=(
tmux tmux
colored-man-pages colored-man-pages
command-not-found command-not-found
dirhistory
zsh-autopair zsh-autopair
fast-syntax-highlighting fast-syntax-highlighting
) )
@@ -116,7 +115,7 @@ if hash fzf 2>/dev/null; then
if hash paru 2>/dev/null; then if hash paru 2>/dev/null; then
function pi { function pi {
paru -Slq | fzf -q "$1" --border-label="Packages" --multi --preview 'paru -Si {1}' | xargs -ro paru -S paru -Slq | fzf -q "$1" --border-label="Packages" --multi --preview 'paru -Si {1} --color=always' | xargs -ro paru -S
} }
fi fi
fi fi