mirror of
https://github.com/bertptrs/vimconfig.git
synced 2025-12-27 13:30:31 +01:00
Compare commits
9 Commits
c71460b481
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| c5ecd6c98d | |||
| a939dfe553 | |||
| 47436ddc59 | |||
| 4bd7364423 | |||
| 7b2830d0f9 | |||
| 94a179c162 | |||
| 9b03c61bf2 | |||
| 97e6e79755 | |||
| 515f854701 |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -61,3 +61,6 @@
|
|||||||
[submodule "zsh/.config/zsh/plugins/zsh-auto-notify"]
|
[submodule "zsh/.config/zsh/plugins/zsh-auto-notify"]
|
||||||
path = zsh/.config/zsh/plugins/zsh-auto-notify
|
path = zsh/.config/zsh/plugins/zsh-auto-notify
|
||||||
url = https://github.com/MichaelAquilina/zsh-auto-notify.git
|
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
|
||||||
|
|||||||
@@ -20,9 +20,11 @@
|
|||||||
[push]
|
[push]
|
||||||
default = simple
|
default = simple
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
|
followTags = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
|
conflictstyle = zdiff3
|
||||||
|
|
||||||
[help]
|
[help]
|
||||||
autocorrect = 10
|
autocorrect = 10
|
||||||
@@ -46,11 +48,13 @@
|
|||||||
|
|
||||||
[rebase]
|
[rebase]
|
||||||
autosquash = true
|
autosquash = true
|
||||||
updateRefs = true
|
updaterefs = true
|
||||||
autoStash = true
|
autoStash = true
|
||||||
|
|
||||||
[fetch]
|
[fetch]
|
||||||
prune = true
|
prune = true
|
||||||
|
pruneTags = true
|
||||||
|
all = true
|
||||||
|
|
||||||
[sendemail]
|
[sendemail]
|
||||||
smtpserver = charon.bertptrs.nl
|
smtpserver = charon.bertptrs.nl
|
||||||
@@ -72,3 +76,15 @@
|
|||||||
# Mark any lines that were added in a skipped commit and can not be
|
# Mark any lines that were added in a skipped commit and can not be
|
||||||
# attributed with a `*`
|
# attributed with a `*`
|
||||||
markUnblamableLines = true
|
markUnblamableLines = true
|
||||||
|
[branch]
|
||||||
|
sort = -committerdate
|
||||||
|
[diff]
|
||||||
|
algorithm = histogram
|
||||||
|
colorMoved = plain
|
||||||
|
mnemonicprefix = true
|
||||||
|
renames = true
|
||||||
|
[rerere]
|
||||||
|
enabled = true
|
||||||
|
autoupdate = true
|
||||||
|
[tag]
|
||||||
|
sort = version:refname
|
||||||
|
|||||||
1
vim/.vim/pack/bundle/start/vim-pkgbuild
Submodule
1
vim/.vim/pack/bundle/start/vim-pkgbuild
Submodule
Submodule vim/.vim/pack/bundle/start/vim-pkgbuild added at 5fc4106609
@@ -54,6 +54,7 @@ fun! StripTrailingWhitespace()
|
|||||||
endfun
|
endfun
|
||||||
|
|
||||||
autocmd BufWritePre * call StripTrailingWhitespace()
|
autocmd BufWritePre * call StripTrailingWhitespace()
|
||||||
|
autocmd filetype pkgbuild setlocal tabstop=2 shiftwidth=2 expandtab
|
||||||
|
|
||||||
" Keep backup files etc out of the way
|
" Keep backup files etc out of the way
|
||||||
set undofile
|
set undofile
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ plugins=(
|
|||||||
zsh-autosuggestions/zsh-autosuggestions.zsh
|
zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
zsh-you-should-use/you-should-use.plugin.zsh
|
zsh-you-should-use/you-should-use.plugin.zsh
|
||||||
nix-zsh-completions/nix-zsh-completions.plugin.zsh
|
nix-zsh-completions/nix-zsh-completions.plugin.zsh
|
||||||
zsh-auto-notify/auto-notify.plugin.zsh
|
|
||||||
)
|
)
|
||||||
|
|
||||||
for plugin in "${plugins[@]}"; do
|
for plugin in "${plugins[@]}"; do
|
||||||
@@ -61,24 +60,6 @@ done
|
|||||||
|
|
||||||
fpath+=("$ZDOTDIR/plugins/nix-zsh-completions")
|
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
|
## Autosuggest plugin configuration
|
||||||
# Consider autocomplete in completion
|
# Consider autocomplete in completion
|
||||||
ZSH_AUTOSUGGEST_STRATEGY=(history 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 gcs='gcloud compute ssh --tunnel-through-iap'
|
||||||
alias gscp='gcloud compute scp --tunnel-through-iap'
|
alias gscp='gcloud compute scp --tunnel-through-iap'
|
||||||
alias gci='gcloud compute instances'
|
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.
|
# Not an alias but useful nonetheless.
|
||||||
function pasters() {
|
function pasters() {
|
||||||
@@ -116,6 +100,12 @@ function pasters() {
|
|||||||
# Ensure we can make cheap copies on btrfs
|
# Ensure we can make cheap copies on btrfs
|
||||||
alias cp='cp --reflink=auto'
|
alias cp='cp --reflink=auto'
|
||||||
|
|
||||||
|
function pullall() {
|
||||||
|
for repo in "$@"; do
|
||||||
|
echo "$repo"
|
||||||
|
done | xargs -P0 -I{} git -C {} pull
|
||||||
|
}
|
||||||
|
|
||||||
if (( $+commands[thefuck] ))
|
if (( $+commands[thefuck] ))
|
||||||
then
|
then
|
||||||
alias fuck='$(thefuck $(fc -ln -1))'
|
alias fuck='$(thefuck $(fc -ln -1))'
|
||||||
@@ -125,6 +115,11 @@ eval "$(dircolors)"
|
|||||||
|
|
||||||
# Initialize the prompt
|
# Initialize the prompt
|
||||||
source "${ZDOTDIR:-$HOME}/.zshtheme"
|
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
|
# Setup the CNF hook
|
||||||
if [[ -s /usr/share/doc/pkgfile/command-not-found.zsh ]]; then
|
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
|
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
|
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
|
||||||
fi
|
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
|
||||||
|
}
|
||||||
|
|||||||
Submodule zsh/.config/zsh/plugins/zsh-auto-notify deleted from 43dbc4eb56
Submodule zsh/.config/zsh/plugins/zsh-autosuggestions updated: a411ef3e09...e52ee8ca55
Reference in New Issue
Block a user