Merge branch 'master' of git.its1.de:public/dotfiles

5 files changed, 18 insertions, 8 deletions

diff --git a/git/config b/git/config
index 1ea1370..c45c684 100644
--- a/git/config
+++ b/git/config
@@ -34,4 +34,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"
diff --git a/install.sh b/install.sh
index 247b204..ffe43ba 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -eu
 
 SCRIPT_DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 
diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua
index f79f577..f80ee2d 100644
--- a/nvim/lua/plugins/format.lua
+++ b/nvim/lua/plugins/format.lua
@@ -12,18 +12,18 @@ return {
   },
   opts = {
     formatters_by_ft = {
-      awk = { "gawk" }, -- pkg install gawk
-      bash = { "shfmt" },
+      awk = { "gawk" }, -- brew install gawk, pkg install gawk
+      bash = { "shfmt" }, -- brew install shfmt, pkg install shfmt
       c = {}, -- clangd
       cpp = {}, -- clangd
-      html = { "prettier" }, -- npm install -g prettier
-      javascript = { "prettier" },
+      html = { "prettier" }, -- (siehe "typescript")
+      javascript = { "prettier" }, -- (siehe "typescript")
       json = { "jq" }, -- brew install jq, pkg install jq
       lua = { "stylua" }, -- brew install stylua, pkg install stylua
       python = { "ruff_format" }, -- brew install ruff, pkg install ruff
       sh = { "shfmt" }, -- brew install, pkg install shfmt
       typescript = { "prettier" }, -- npm install -g prettier
-      xml = { "xmllint" }, -- xmllint ist Teil von libxml2
+      xml = { "xmllint" }, -- xmllint ist Teil von libxml2 (standardmäßig installiert unter MacOS; pkg install libxml2)
       xsd = { "xmllint" },
       yaml = { "yamlfmt" }, -- brew install yamlfmt, pkg install yamlfmt
     },
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index 03a6be0..b301b68 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -60,6 +60,10 @@ return {
         capabilities = capabilities,
       }
 
+      vim.lsp.config.html = {
+        capabilities = capabilities,
+      }
+
       vim.lsp.config.vtsls = {
         capabilities = capabilities,
         settings = {
@@ -109,8 +113,9 @@ return {
         "basedpyright", -- npm install -g basedpyright, brew install basedpyright
         "bashls", -- npm install -g bash-language-server, pkg install hs-ShellCheck
         "clangd", -- pkg install llvm
+        "html", -- npm install -g vscode-langservers-extracted
         "jsonls", -- npm install -g vscode-langservers-extracted
-        "lua_ls", -- pkg install lua-language-server
+        "lua_ls", -- pkg install lua-language-server, brew install lua-language-server
         "prismals", -- npm install -g @prisma/language-server
         "vtsls", -- npm install -g @vtsls/language-server
       })
diff --git a/zsh/zshrc b/zsh/zshrc
index 53fb25a..106c0df 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -82,6 +82,11 @@ alias nvim-update='nvim --headless "+Lazy! sync" "+qa"'
 autoload -U compinit; compinit
 _comp_options+=(globdots) # With hidden files
 
+# ... Angular CLI
+if (( $+commands[ng] )); then
+  source <(ng completion script)
+fi
+
 zstyle ':completion:*' completer _extensions _complete _approximate
 
 zstyle ':completion:*' menu select