1
0
mirror of https://github.com/bertptrs/vimconfig.git synced 2025-12-25 20:40:32 +01:00

Compare commits

...

11 Commits

Author SHA1 Message Date
c5ecd6c98d Fix memory reporting 2025-12-16 16:14:40 +01:00
a939dfe553 Alias I keep forgetting 2025-10-27 16:59:28 +01:00
47436ddc59 Missed modules 2025-05-30 13:23:31 +02:00
4bd7364423 Add PKGBUILD handling 2025-05-30 13:22:40 +02:00
7b2830d0f9 Remove auto-notify
It's too noisy
2025-03-30 00:25:01 +01:00
94a179c162 Better git settings
Source: https://blog.gitbutler.com/how-git-core-devs-configure-git/
2025-03-19 11:45:00 +01:00
9b03c61bf2 Pullall helper 2025-02-06 09:22:07 +01:00
97e6e79755 Enable zsh self-reporting 2025-02-05 21:28:22 +01:00
515f854701 Add repo checkout script 2024-08-10 23:34:01 +02:00
c71460b481 Update deps 2024-08-06 00:07:41 +02:00
804d6dab3c Slightly better ruby env 2024-08-06 00:01:49 +02:00
10 changed files with 66 additions and 24 deletions

3
.gitmodules vendored
View File

@@ -61,3 +61,6 @@
[submodule "zsh/.config/zsh/plugins/zsh-auto-notify"]
path = zsh/.config/zsh/plugins/zsh-auto-notify
url = https://github.com/MichaelAquilina/zsh-auto-notify.git
[submodule "vim/.vim/pack/bundle/start/vim-pkgbuild"]
path = vim/.vim/pack/bundle/start/vim-pkgbuild
url = https://github.com/m-pilia/vim-pkgbuild.git

View File

@@ -20,9 +20,11 @@
[push]
default = simple
autoSetupRemote = true
followTags = true
[merge]
tool = vimdiff
conflictstyle = zdiff3
[help]
autocorrect = 10
@@ -46,11 +48,13 @@
[rebase]
autosquash = true
updateRefs = true
updaterefs = true
autoStash = true
[fetch]
prune = true
pruneTags = true
all = true
[sendemail]
smtpserver = charon.bertptrs.nl
@@ -72,3 +76,15 @@
# Mark any lines that were added in a skipped commit and can not be
# attributed with a `*`
markUnblamableLines = true
[branch]
sort = -committerdate
[diff]
algorithm = histogram
colorMoved = plain
mnemonicprefix = true
renames = true
[rerere]
enabled = true
autoupdate = true
[tag]
sort = version:refname

View File

@@ -1,3 +1,2 @@
---
BUNDLE_PATH: "~/.gem"
BUNDLE_AUTO_INSTALL: "true"

View File

@@ -54,6 +54,7 @@ fun! StripTrailingWhitespace()
endfun
autocmd BufWritePre * call StripTrailingWhitespace()
autocmd filetype pkgbuild setlocal tabstop=2 shiftwidth=2 expandtab
" Keep backup files etc out of the way
set undofile

View File

@@ -50,7 +50,6 @@ plugins=(
zsh-autosuggestions/zsh-autosuggestions.zsh
zsh-you-should-use/you-should-use.plugin.zsh
nix-zsh-completions/nix-zsh-completions.plugin.zsh
zsh-auto-notify/auto-notify.plugin.zsh
)
for plugin in "${plugins[@]}"; do
@@ -61,24 +60,6 @@ done
fpath+=("$ZDOTDIR/plugins/nix-zsh-completions")
# Configure auto-notify
AUTO_NOTIFY_IGNORE+=(
"gcloud compute ssh"
"nix run"
"bash"
"sem debug"
"git "{commit,grep,log}
"journalctl"
"jekyll serve"
"sudoedit"
"ipython"{,3}
"sem "{attach,debug}
"psql"
"sqlite3"
"iotop"
)
## Autosuggest plugin configuration
# Consider autocomplete in completion
ZSH_AUTOSUGGEST_STRATEGY=(history completion)
@@ -104,6 +85,9 @@ alias nrc='nix shell --file default.nix -c'
alias gcs='gcloud compute ssh --tunnel-through-iap'
alias gscp='gcloud compute scp --tunnel-through-iap'
alias gci='gcloud compute instances'
# This invocation is so much more complicated than it needs to be, but
# Google will only show mountain time otherwise.
alias gops='gcloud compute operations list --format=":(TIMESTAMP.date(tz=LOCAL))" --sort-by=TIMESTAMP'
# Not an alias but useful nonetheless.
function pasters() {
@@ -116,6 +100,12 @@ function pasters() {
# Ensure we can make cheap copies on btrfs
alias cp='cp --reflink=auto'
function pullall() {
for repo in "$@"; do
echo "$repo"
done | xargs -P0 -I{} git -C {} pull
}
if (( $+commands[thefuck] ))
then
alias fuck='$(thefuck $(fc -ln -1))'
@@ -125,6 +115,11 @@ eval "$(dircolors)"
# Initialize the prompt
source "${ZDOTDIR:-$HOME}/.zshtheme"
# Report commands that take longer than ten seconds, or more than 10MB
# of RAM
REPORTTIME=10
REPORTMEMORY=10240
TIMEFMT='%J %U user %S system %P cpu %*E total; max RSS %MkB'
# Setup the CNF hook
if [[ -s /usr/share/doc/pkgfile/command-not-found.zsh ]]; then
@@ -309,3 +304,31 @@ fi
if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
fi
#####################
# Arch Linux things #
#####################
function arch-pkg-cd() {
# Inspired by Segaja: https://gitlab.com/Segaja/dotfiles_base/-/blob/main/distro_arch/.config/zsh/os.zsh#L118-133
local arch_repo_folder="${HOME}/projects/arch/packaging/packages"
if [[ ! -d "$arch_repo_folder/$1" ]]; then
if pacman -Si "$1" &> /dev/null; then
cd "$arch_repo_folder"
pkgctl repo clone "$1"
elif [[ "$2" = '-c' ]]; then
cd "$arch_repo_folder"
pkgctl repo create --clone "$1"
else
echo "Non-existent package, use -c to create" >&2
return 1
fi
cd "$1"
return 0
else
cd "$arch_repo_folder/$1"
pkgctl repo configure
git pull --rebase --autostash
fi
}