{bash,zsh}rc: turn vim alias into a function

Resolves: #160
Resolves: sudo vim

.pre-commit-config.yaml

@@ -25,7 +25,6 @@ repos:
       - id: destroyed-symlinks
       - id: detect-private-key
       - id: end-of-file-fixer
-        exclude: .*\.nginx$
       - id: fix-byte-order-marker
       - id: trailing-whitespace
         # Markdown allows double trailing space for forced line change. The
@@ -118,17 +117,15 @@ repos:
     hooks:
       - id: prettier
         # These are handled by Black below
-        exclude_types:
+        exclude_types: [python, pyi, jupyter]
-          [python, pyi, jupyter]
+        additional_dependencies: [
-          #additional_dependencies:
+            # https://www.npmjs.com/package/prettier
-          #[
+            "prettier@3.0.3",
-          # https://www.npmjs.com/package/prettier
+            # https://www.npmjs.com/package/prettier-plugin-nginx
-          #"prettier@3.0.1",
+            "prettier-plugin-nginx@1.0.3",
-          # https://www.npmjs.com/package/prettier-plugin-nginx
+            # https://www.npmjs.com/package/prettier-plugin-toml
-          #"prettier-plugin-nginx@1.0.3",
+            "prettier-plugin-toml@1.0.0",
-          # https://www.npmjs.com/package/prettier-plugin-toml
+          ]
-          #"prettier-plugin-toml@1.0.0",
-          #]
 
   # Black, opinionated Python code formatter
   # - repo: https://github.com/psf/black
@@ -153,7 +150,6 @@ repos:
         alias: ec
         # I don't actually care about line lengths as more than a guideline
         args: [-disable-max-line-length]
-        exclude: .*\.nginx$
 
   # # Python linter
   # - repo: local

etc/nginx/sites-enabled/old/host.nginx

@@ -27,10 +27,10 @@ server {
 	ssl_prefer_server_ciphers on;
 	# Enable this if your want HSTS (recommended)
 	add_header                Strict-Transport-Security
-	  "max-age=15552000; includeSubdomains; preload";
+		"max-age=15552000; includeSubdomains; preload";
 	add_header                X-Frame-Options SAMEORIGIN;
 	add_header                Content-Security-Policy
-	  upgrade-insecure-requests;
+		upgrade-insecure-requests;
 	add_header                X-Xss-Protection "1; mode=block" always;
 	add_header                X-Content-Type-Options "nosniff" always;
 	# OCSP Stapling ---

etc/nginx/sites-enabled/rproxy.nginx

@@ -5,7 +5,7 @@ server {
 	listen      [::]:443;
 	# Enable this if your want HSTS (recommended)
 	add_header  Strict-Transport-Security
-	  "max-age=15552000; includeSubdomains; preload";
+		"max-age=15552000; includeSubdomains; preload";
 	add_header  X-Frame-Options SAMEORIGIN;
 	add_header  Content-Security-Policy upgrade-insecure-requests;
 	add_header  X-Xss-Protection "1; mode=block" always;

etc/nginx/sites-enabled/vhost.nginx

@@ -6,7 +6,7 @@ server {
 	listen      [::]:443;
 	# Enable this if your want HSTS (recommended)
 	add_header  Strict-Transport-Security
-	  "max-age=15552000; includeSubdomains; preload";
+		"max-age=15552000; includeSubdomains; preload";
 	add_header  X-Frame-Options SAMEORIGIN;
 	add_header  Content-Security-Policy upgrade-insecure-requests;
 	add_header  X-Xss-Protection "1; mode=block" always;

rc/bashrc

@@ -541,13 +541,6 @@ fi
 # More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
 alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
 
-# I use nvim, while I keep running vim instead
-if hash nvim 2>/dev/null; then
-	alias vim="echo 'using nvim instead' && nvim"
-else
-	alias vim="echo 'nvim not found' && \vim"
-fi
-
 # Allow custom aliases to be put in .aliases or .bash_aliases .
 
 # .aliases
@@ -814,6 +807,19 @@ ssh-verify-file() {
 	ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig <$2
 }
 
+# I use nvim, while I keep running vim instead
+if hash nvim 2>/dev/null; then
+	vim() {
+		echo 'using nvim instead'
+		nvim $@
+	}
+else
+	vim() {
+		echo 'nvim not found'
+		\vim $@
+	}
+fi
+
 # Source files for miscannellious modifications.
 
 # acme.sh

rc/zshrc

@@ -523,13 +523,6 @@ fi
 # More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
 alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
 
-# I use nvim, while I keep running vim instead
-if hash nvim 2>/dev/null; then
-	alias vim="echo 'using nvim instead' && nvim"
-else
-	alias vim="echo 'nvim not found' && \vim"
-fi
-
 # Allow custom aliases to be put in .aliases or .zsh_aliases .
 
 # .aliases
@@ -800,6 +793,18 @@ ssh-verify-file () {
 	ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig < $2
 }
 
+# I use nvim, while I keep running vim instead
+if hash nvim 2>/dev/null; then
+	vim() {
+		echo 'using nvim instead'
+		nvim $@
+	}
+else
+	vim() {
+		echo 'nvim not found'
+		\vim $@
+	}
+fi
 
 # Source files for miscannellious modifications.