pre-commit run --all-files

I remembered and noticed that there are multiple xml config files present

.gitignore

@@ -23,5 +23,4 @@
 install.run
 LICENSE
 
-
 node_modules/

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 ci:
   # Attempts to use networking and fails at name resolution, local hook
   # skip: [bundler-audit, pylint, latexmk, exiftool]
-  skip: [pnpm-prettier]
+  skip: [prettier]
   # Forĝejo/Gitea mirrors will autoclose pull requests. This should decrease
   # the frequency of unnecessary PRs.
   # https://github.com/pre-commit-ci/issues/issues/83
@@ -129,28 +129,12 @@ repos:
 
   - repo: local
     hooks:
-      - id: pnpm-prettier
+      - id: prettier
         name: prettier
         entry: pnpm exec prettier --cache --ignore-unknown --write
         language: system
         exclude_types: [json]
 
-  #- repo: https://github.com/pre-commit/mirrors-prettier
-  # - repo: https://github.com/rbubley/mirrors-prettier
-  #   rev: "v3.2.5"
-  #   hooks:
-  #     - id: prettier
-  #       additional_dependencies: [
-  #           # https://www.npmjs.com/package/prettier
-  #           "prettier@3.2.5",
-  #           # https://www.npmjs.com/package/prettier-plugin-nginx
-  #           "prettier-plugin-nginx@1.0.3",
-  #           # https://www.npmjs.com/package/prettier-plugin-toml
-  #           "prettier-plugin-toml@2.0.1",
-  #           # https://www.npmjs.com/package/prettier-plugin-sort-json
-  #           #"prettier-plugin-sort-json@4.0.0",
-  #         ]
-
   # Black, opinionated Python code formatter
   # - repo: https://github.com/psf/black
   #   rev: 23.9.1

.prettierignore

@@ -1,5 +1,3 @@
 *.py*
 *.jupyter
 *.json
-# prettier-plugin-sh is very unhappy with it
-rc/zshrc

.prettierrc

@@ -2,7 +2,8 @@
 	"plugins": [
 		"prettier-plugin-nginx",
 		"prettier-plugin-toml",
-		"prettier-plugin-sh"
+		"prettier-plugin-sh",
+		"@prettier/plugin-xml"
 	],
 	"overrides": [
 		{ "files": ".prettierrc", "options": { "parser": "json" } },

conf/pastebinit.xml

@@ -1,6 +1,6 @@
 <pastebinit>
 	<pastebin>http://sprunge.us</pastebin>
-	<author></author>
-	<jabberid></jabberid>
+	<author />
+	<jabberid />
 	<format>text</format>
 </pastebinit>

etc/fahclient/config.xml

@@ -1,21 +1,21 @@
 <config>
 	<!-- Client Control -->
-	<client-threads v='2'/>
-	<fold-anon v='true'/>
+	<client-threads v='2' />
+	<fold-anon v='true' />
 
 	<!-- Folding Core -->
-	<cpu-usage v='50'/>
-	<gpu-usage v='50'/>
+	<cpu-usage v='50' />
+	<gpu-usage v='50' />
 
 	<!-- Slot Control -->
-	<power v='MEDIUM'/>
+	<power v='MEDIUM' />
 
 	<!-- User Information -->
-	<passkey v=''/>
-	<team v='201753'/>
-	<user v='Mikaela'/>
+	<passkey v='' />
+	<team v='201753' />
+	<user v='Mikaela' />
 
 	<!-- Folding Slots -->
-	<slot id='0' type='CPU'/>
-	<slot id='1' type='GPU'/>
+	<slot id='0' type='CPU' />
+	<slot id='1' type='GPU' />
 </config>

etc/systemd-resolv.conf-generate.bash

@@ -7,7 +7,7 @@ set -x
 
 # I know there are old versions that used something else, but I don't remember
 # that name and they are ancient.
-if ! hash resolvectl 2>/dev/null; then
+if ! hash resolvectl 2> /dev/null; then
 	echo "You don't seem to have systemd-resolved (or resolvectl) installed." 1>&2
 	exit 1
 fi

install

@@ -13,42 +13,42 @@ fi
 
 export MIKAELA_GREP=$HOME/.MIKAELA_GREP
 
-cat rc/bashrc >~/.bashrc
-cat conf/tmux.conf >~/.tmux.conf
-cat rc/zshrc >~/.zshrc
-cat rc/profile >~/.profile
+cat rc/bashrc > ~/.bashrc
+cat conf/tmux.conf > ~/.tmux.conf
+cat rc/zshrc > ~/.zshrc
+cat rc/profile > ~/.profile
 mkdir -p ~/.config/git
-cat conf/gitconfig >~/.config/git/config
+cat conf/gitconfig > ~/.config/git/config
 touch ~/.gitconfig
 rm ~/.gitconfig
 ln -nsfv ~/.config/git/config ~/.gitconfig
 mkdir -p ~/.git-template
-cat rc/vimrc >~/.vimrc
+cat rc/vimrc > ~/.vimrc
 mkdir -p ~/.config/nvim/
-cat conf/init.vim >~/.config/nvim/init.vim
-cat conf/makepkg.conf >~/.makepkg.conf
+cat conf/init.vim > ~/.config/nvim/init.vim
+cat conf/makepkg.conf > ~/.makepkg.conf
 mkdir -p ~/.config/mpv/
-cat conf/mpv.conf >~/.config/mpv/mpv.conf
+cat conf/mpv.conf > ~/.config/mpv/mpv.conf
 if [ ! -f ~/.oidentd.conf ]; then
-	cat conf/oidentd.conf >~/.oidentd.conf
+	cat conf/oidentd.conf > ~/.oidentd.conf
 fi
 mkdir -p ~/.gnupg
-cat gpg/gpg.conf >~/.gnupg/gpg.conf
-cat gpg/gpg-agent.conf >~/.gnupg/gpg-agent.conf
-cat gpg/dirmngr.conf >~/.gnupg/dirmngr.conf
+cat gpg/gpg.conf > ~/.gnupg/gpg.conf
+cat gpg/gpg-agent.conf > ~/.gnupg/gpg-agent.conf
+cat gpg/dirmngr.conf > ~/.gnupg/dirmngr.conf
 killall -HUP dirmngr
 #cat rc/xinitrc > ~/.xinitrc
-cat conf/pastebinit.xml >~/.pastebinit.xml
-cat conf/Xresources >~/.Xresources
+cat conf/pastebinit.xml > ~/.pastebinit.xml
+cat conf/Xresources > ~/.Xresources
 mkdir -p ~/.inxi
-cat conf/inxi.conf >~/.inxi/inxi.conf
+cat conf/inxi.conf > ~/.inxi/inxi.conf
 gpg --quiet --import .mikaela/keys/*.asc &
 mkdir -p ~/.ssh/sockets/
 chmod a+xr chmod
 bash -x ./chmod &
 git submodule update --init &
 
-if hash pre-commit 2>/dev/null; then
+if hash pre-commit 2> /dev/null; then
 	pre-commit init-templatedir ~/.git-template
 	pre-commit gc
 fi

package.json

@@ -1,6 +1,7 @@
 {
   "devDependencies": {
-    "prettier": "3.2.5",
+    "@prettier/plugin-xml": "3.4.1",
+    "prettier": "3.3.2",
     "prettier-plugin-nginx": "1.0.3",
     "prettier-plugin-sh": "0.14.0",
     "prettier-plugin-toml": "2.0.1"

pnpm-lock.yaml

@@ -7,20 +7,31 @@ settings:
 importers:
   .:
     devDependencies:
+      "@prettier/plugin-xml":
+        specifier: 3.4.1
+        version: 3.4.1(prettier@3.3.2)
       prettier:
-        specifier: 3.2.5
-        version: 3.2.5
+        specifier: 3.3.2
+        version: 3.3.2
       prettier-plugin-nginx:
         specifier: 1.0.3
         version: 1.0.3
       prettier-plugin-sh:
         specifier: 0.14.0
-        version: 0.14.0(prettier@3.2.5)
+        version: 0.14.0(prettier@3.3.2)
       prettier-plugin-toml:
         specifier: 2.0.1
-        version: 2.0.1(prettier@3.2.5)
+        version: 2.0.1(prettier@3.3.2)
 
 packages:
+  "@prettier/plugin-xml@3.4.1":
+    resolution:
+      {
+        integrity: sha512-Uf/6/+9ez6z/IvZErgobZ2G9n1ybxF5BhCd7eMcKqfoWuOzzNUxBipNo3QAP8kRC1VD18TIo84no7LhqtyDcTg==,
+      }
+    peerDependencies:
+      prettier: ^3.0.0
+
   "@taplo/core@0.1.1":
     resolution:
       {
@@ -33,6 +44,18 @@ packages:
         integrity: sha512-DV/Re3DPVY+BhBtLZ3dmP4mP6YMLSsgq9qGLXwOV38lvNF/fBlgvQswzlXmzCEefL/3q2eMoefZpOI/+GLuCNA==,
       }
 
+  "@xml-tools/parser@1.0.11":
+    resolution:
+      {
+        integrity: sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==,
+      }
+
+  chevrotain@7.1.1:
+    resolution:
+      {
+        integrity: sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==,
+      }
+
   mvdan-sh@0.10.1:
     resolution:
       {
@@ -63,14 +86,20 @@ packages:
     peerDependencies:
       prettier: ^3.0.3
 
-  prettier@3.2.5:
+  prettier@3.3.2:
     resolution:
       {
-        integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==,
+        integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==,
       }
     engines: { node: ">=14" }
     hasBin: true
 
+  regexp-to-ast@0.5.0:
+    resolution:
+      {
+        integrity: sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==,
+      }
+
   sh-syntax@0.4.2:
     resolution:
       {
@@ -85,28 +114,43 @@ packages:
       }
 
 snapshots:
+  "@prettier/plugin-xml@3.4.1(prettier@3.3.2)":
+    dependencies:
+      "@xml-tools/parser": 1.0.11
+      prettier: 3.3.2
+
   "@taplo/core@0.1.1": {}
 
   "@taplo/lib@0.4.0-alpha.2":
     dependencies:
       "@taplo/core": 0.1.1
 
+  "@xml-tools/parser@1.0.11":
+    dependencies:
+      chevrotain: 7.1.1
+
+  chevrotain@7.1.1:
+    dependencies:
+      regexp-to-ast: 0.5.0
+
   mvdan-sh@0.10.1: {}
 
   prettier-plugin-nginx@1.0.3: {}
 
-  prettier-plugin-sh@0.14.0(prettier@3.2.5):
+  prettier-plugin-sh@0.14.0(prettier@3.3.2):
     dependencies:
       mvdan-sh: 0.10.1
-      prettier: 3.2.5
+      prettier: 3.3.2
       sh-syntax: 0.4.2
 
-  prettier-plugin-toml@2.0.1(prettier@3.2.5):
+  prettier-plugin-toml@2.0.1(prettier@3.3.2):
     dependencies:
       "@taplo/lib": 0.4.0-alpha.2
-      prettier: 3.2.5
+      prettier: 3.3.2
 
-  prettier@3.2.5: {}
+  prettier@3.3.2: {}
+
+  regexp-to-ast@0.5.0: {}
 
   sh-syntax@0.4.2:
     dependencies:

rc/profile

@@ -2,7 +2,7 @@
 PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/snap/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
 
 # Add RubyGems to PATH
-if hash ruby 2>/dev/null; then
+if hash ruby 2> /dev/null; then
 	PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH"
 fi
 
@@ -21,7 +21,7 @@ PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS;
 ulimit -c unlimited
 
 # Numlock on at boot
-if hash numlockx 2>/dev/null; then
+if hash numlockx 2> /dev/null; then
 	numlockx on
 fi