aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap/neovim.sh28
-rw-r--r--nvim/lua/plugins/format.lua2
2 files changed, 28 insertions, 2 deletions
diff --git a/bootstrap/neovim.sh b/bootstrap/neovim.sh
index bf8d8ad..3d92af0 100755
--- a/bootstrap/neovim.sh
+++ b/bootstrap/neovim.sh
@@ -78,10 +78,36 @@ install_npm() {
78 npm install -g "$package" 78 npm install -g "$package"
79} 79}
80 80
81install_pipx() {
82 binary="$1"
83 package="$2"
84
85 if have "$binary"; then
86 printf "✓ %-32s vorhanden\n" "$binary"
87 return
88 fi
89
90 if ! have pipx; then
91 die "pipx wurde nicht gefunden."
92 fi
93
94 printf "→ Installiere pipx-Paket %s\n" "$package"
95 pipx install "$package"
96}
97
81install_prerequisites() { 98install_prerequisites() {
82 install_pkg curl curl 99 install_pkg curl curl
83 install_pkg git git 100 install_pkg git git
84 install_pkg node node 101 install_pkg node node
102
103 case "$OS" in
104 Darwin)
105 install_pkg pipx pipx
106 ;;
107 FreeBSD)
108 install_pkg pipx py-pipx
109 ;;
110 esac
85} 111}
86 112
87install_formatters() { 113install_formatters() {
@@ -92,11 +118,11 @@ install_formatters() {
92 install_pkg shfmt shfmt 118 install_pkg shfmt shfmt
93 install_pkg stylua stylua 119 install_pkg stylua stylua
94 install_pkg yamlfmt yamlfmt 120 install_pkg yamlfmt yamlfmt
121 install_pipx djlint djlint
95 122
96 case "$OS" in 123 case "$OS" in
97 Darwin) 124 Darwin)
98 install_pkg clang-format clang-format 125 install_pkg clang-format clang-format
99 install_pkg djlint djlint
100 ;; 126 ;;
101 FreeBSD) 127 FreeBSD)
102 install_pkg xmllint libxml2 128 install_pkg xmllint libxml2
diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua
index 686de60..c6a2f2a 100644
--- a/nvim/lua/plugins/format.lua
+++ b/nvim/lua/plugins/format.lua
@@ -1,7 +1,7 @@
1-- Verfügbare Formater: https://github.com/stevearc/conform.nvim/tree/master/lua/conform/formatters 1-- Verfügbare Formater: https://github.com/stevearc/conform.nvim/tree/master/lua/conform/formatters
2 2
3local clang = {} 3local clang = {}
4local djlint = { "djlint" } -- brew install djlint (macOS); unter Windows kein winget-Paket, siehe neovim-windows-setup.md 4local djlint = { "djlint" } -- pipx install djlint (macOS & FreeBSD); unter Windows kein winget-Paket, siehe neovim-windows-setup.md
5local gawk = { "gawk" } -- brew install gawk, pkg install gawk 5local gawk = { "gawk" } -- brew install gawk, pkg install gawk
6local jq = { "jq" } -- brew install jq, pkg install jq 6local jq = { "jq" } -- brew install jq, pkg install jq
7local prettier = { "prettier" } -- npm install -g prettier 7local prettier = { "prettier" } -- npm install -g prettier