Merge branch 'master' into add-jinja-support

7 files changed, 63 insertions, 9 deletions

diff --git a/git/config b/git/config
index 411b924..f53f526 100644
--- a/git/config
+++ b/git/config
@@ -39,3 +39,4 @@
 [alias]
         lg = log --color --graph --pretty=format:'%C(magenta)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches
         cleanup = "!git branch --merged master --format='%(refname:short)' | grep -v '^master$' | xargs -r git branch -d"
+        sync = !git commit -am \"sync\" && git push
diff --git a/windows/bin/gmake.cmd b/windows/bin/gmake.cmd
index 1c45ce5..5f2bad4 100644
--- a/windows/bin/gmake.cmd
+++ b/windows/bin/gmake.cmd
@@ -1,11 +1,7 @@
 @echo off
+
 rem Wrapper, damit opt.makeprg = "gmake" (aus nvim/lua/config/options.lua)
-rem unter Windows funktioniert, ohne die bestehende Config anzupassen.
-rem Reicht alle Argumente an das im PATH gefundene "make" weiter.
-rem
-rem Einmalig einrichten: dieses Verzeichnis (windows\bin) zum PATH
-rem hinzufuegen, z.B. ueber:
-rem   setx PATH "%PATH%;%USERPROFILE%\dotfiles\windows\bin"
+rem unter Windows funktioniert.
 
 make %*
 exit /b %ERRORLEVEL%
diff --git a/windows/bin/npm-update.cmd b/windows/bin/npm-update.cmd
new file mode 100644
index 0000000..9152c97
--- /dev/null
+++ b/windows/bin/npm-update.cmd
@@ -0,0 +1,3 @@
+@echo off
+
+npm update -g --loglevel=info
diff --git a/windows/bin/nvim-update.cmd b/windows/bin/nvim-update.cmd
index 7521e7e..5317f34 100644
--- a/windows/bin/nvim-update.cmd
+++ b/windows/bin/nvim-update.cmd
@@ -1,8 +1,5 @@
 @echo off
 
-rem Prüft vor dem Parser-Update, ob ein C-Compiler (cl.exe, MSVC) im PATH
-rem gefunden wird - nvim-treesitter braucht ihn zum Kompilieren der Parser.
-
 where /q cl.exe
 if errorlevel 1 (
   echo [nvim-update] cl.exe nicht gefunden - Neovim aus einer "Developer PowerShell for VS" starten. 1>&2
diff --git a/windows/bin/pkg-update.cmd b/windows/bin/pkg-update.cmd
new file mode 100644
index 0000000..3747579
--- /dev/null
+++ b/windows/bin/pkg-update.cmd
@@ -0,0 +1,3 @@
+@echo off
+
+winget upgrade --all --accept-package-agreements --accept-source-agreements
diff --git a/windows/bin/system-update.cmd b/windows/bin/system-update.cmd
new file mode 100644
index 0000000..6c355d0
--- /dev/null
+++ b/windows/bin/system-update.cmd
@@ -0,0 +1,10 @@
+@echo off
+
+call pkg-update.cmd
+if errorlevel 1 exit /b 1
+
+call npm-update.cmd
+if errorlevel 1 exit /b 1
+
+call nvim-update.cmd
+if errorlevel 1 exit /b 1
diff --git a/zsh/zshrc b/zsh/zshrc
index 6f31eaa..41dc612 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -80,6 +80,25 @@ alias pwgen='pwgen -s 48 1'
 alias ls='ls -G'
 
 # Funktionen
+pkg-update() {
+  case "$OSTYPE" in
+  darwin*)
+    brew update && brew upgrade
+    ;;
+  freebsd*)
+    doas pkg update && doas pkg upgrade
+    ;;
+  *)
+    print -u2 "pkg-update: kein Paketmanager für $OSTYPE hinterlegt"
+    return 1
+    ;;
+  esac
+}
+
+npm-update() {
+  npm update -g --loglevel=info
+}
+
 nvim-update() {
   nvim --headless \
     -c "lua require[[lazy]].sync({ wait = true })" \
@@ -87,6 +106,31 @@ nvim-update() {
     -c "qa"
 }
 
+pkg-clean() {
+  case "$OSTYPE" in
+  darwin*)
+    brew autoremove
+    ;;
+  freebsd*)
+    doas pkg autoremove
+    ;;
+  *)
+    print -u2 "pkg-clean: kein Paketmanager für $OSTYPE hinterlegt"
+    return 1
+    ;;
+  esac
+}
+
+system-update() {
+  pkg-update || return
+  npm-update || return
+  nvim-update || return
+
+  if [[ "$1" == "--clean" ]]; then
+    pkg-clean
+  fi
+}
+
 # Command completion
 autoload -U compinit
 compinit