etc/yum.repos.d: add vscodium

.editorconfig

@@ -22,6 +22,11 @@ max_line_length = 78
 # Opinionated affecting only display, better to not set
 #tab_width =
 
+# https://github.com/jxddk/prettier-plugin-nginx/issues/8
+[*.nginx]
+insert_final_newline = unset
+indent_style = unset
+
 # *nix, just in case
 [*.{bash,sh}]
 # .gitattributes !

.gitattributes

@@ -1,6 +1,6 @@
 # If file is text, use lf line-endings and let forges show it in repo
 # languages. For more information: `man gitattributes`
-*	text=auto eol=lf linguist-detectable
+* text=auto eol=lf linguist-detectable
 
 # Suggestions for inevitably encountering .gitattributeless repositories when
 # .gitattributes cannot be added:
@@ -26,33 +26,33 @@
 # TODO
 #	diff=matlab
 #	diff=pascal
-*.{adb,ads}	diff=ada
-*.bibtex	diff=bibtex
-*.cs	diff=csharp
-*.{c,cpp}	diff=cpp
-*.css	diff=css
-*.dts	diff=dts
-*.{ex,exs}	diff=elixir
-*.{f90,f,for}	diff=fortran
-*.fountain	diff=fountain
-*.go	diff=golang
-*.html	diff=html
-*.java	diff=java
-*.{kt,kts}	diff=kotlin
-*.{h,m,mm,M}	diff=objc
-*.pl	diff=perl
-*.php	diff=php
-*.py	diff=python
-*.rb	diff=ruby
-*.{rs,rlib}	diff=rust
-*.{scm,ss}	diff=scheme
-*.tex	diff=tex
+*.{adb,ads} diff=ada
+*.bibtex diff=bibtex
+*.cs diff=csharp
+*.{c,cpp} diff=cpp
+*.css diff=css
+*.dts diff=dts
+*.{ex,exs} diff=elixir
+*.{f90,f,for} diff=fortran
+*.fountain diff=fountain
+*.go diff=golang
+*.html diff=html
+*.java diff=java
+*.{kt,kts} diff=kotlin
+*.{h,m,mm,M} diff=objc
+*.pl diff=perl
+*.php diff=php
+*.py diff=python
+*.rb diff=ruby
+*.{rs,rlib} diff=rust
+*.{scm,ss} diff=scheme
+*.tex diff=tex
 
 # bash & co aren't often Windows, so alway have lf line-endings regarldess
 # of the above. Markdown is also included as I utilise doctoc, which
 # requires lf line-endings.
 *.{sh,bash,zsh} diff=bash eol=lf
-*.{md,markdown,[mM][dD],[mM][aA][rR][kK][dD][oO][wW][nN]}	diff=markdown eol=lf
+*.{md,markdown,[mM][dD],[mM][aA][rR][kK][dD][oO][wW][nN]} diff=markdown eol=lf
 
 # While this file is like .gitignore, negative patterns are forbidden and
 # directory/ wouldn't recurse, thus directory/**. Also !attribute would set
@@ -65,16 +65,16 @@ Windows/** text=auto eol=crlf
 # The "text" attribute is used as otherwise they rely on auto-detection of
 # textness since there is no diff attribute set.
 # Ref: https://rehansaeed.com/gitattributes-best-practices/#line-endings
-*.{reg,[rR][eE][gG]}	text eol=crlf
-*.{bat,[bB][aA][tT]}	text eol=crlf
-*.{ahk,[aA][hH][kK]}	text eol=crlf
+*.{reg,[rR][eE][gG]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
+*.{ahk,[aA][hH][kK]} text eol=crlf
 
 # These files are scary, let's not touch them. The attribute "lockable" is
 # provided by git-lfs. https://github.com/git-lfs/git-lfs/wiki/File-Locking
-LICENSE	text lockable
-CITATION.cff	text lockable
+LICENSE text lockable
+CITATION.cff text lockable
 
 # NOTE! .gitattributes doesn't support the case-insensitive style above!
 
-package.json	text linguist-vendored
-pnpm-lock.yaml	text linguist-vendored
+package.json text linguist-vendored
+pnpm-lock.yaml text linguist-vendored

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
         # and lack of it break things. Use identify-cli for figuring out more
         # types to add.
         exclude_types: [svg, tsv]
-      - id: end-of-file-fixer
+        #- id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
       # These are not from `pre-commit sample-config`
@@ -160,11 +160,11 @@ repos:
   #- id: black-jupyter
 
   # Shell code formatter, requires Go
-  - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.8.0-1
-    hooks:
-      - id: shfmt
-        #- id: shfmt-docker
+  # - repo: https://github.com/scop/pre-commit-shfmt
+  #   rev: v3.8.0-1
+  #   hooks:
+  #     - id: shfmt
+  #- id: shfmt-docker
 
   # .editorconfig validity checking
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python

.prettierignore

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

.prettierrc

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

CODEOWNERS

@@ -1 +1 @@
-*	@Mikaela
+* @Mikaela

Windows/.gitattributes

@@ -1,2 +1,2 @@
-*	text=auto eol=crlf
-*.{md,markdown}	text eol=lf
+* text=auto eol=crlf
+*.{md,markdown} text eol=lf

conf/i3status-rs/config.toml

@@ -5,7 +5,7 @@
 #		software.
 
 # WIP: migration from i3status
-	# contains: (disk /, disk/home,) load, ipv6, wireless, ethernet, battery, volume, (utc) time, (local time)
+# contains: (disk /, disk/home,) load, ipv6, wireless, ethernet, battery, volume, (utc) time, (local time)
 
 [theme]
 name = "solarized-dark"

etc/dnscrypt-proxy/dnscrypt-proxy.toml

@@ -75,20 +75,28 @@ lb_strategy = 'p2'
 #	file = '/var/log/dnscrypt-proxy/nx.log'
 
 [sources]
-	[sources.'public-resolvers']
-	#url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
-	urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md', 'https://cdn.staticaly.com/gh/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://evilvibes.com/list/public-resolvers.md']
-	cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
-	minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-	refresh_delay = 72
-	prefix = 'public-'
+[sources.'public-resolvers']
+#url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
+urls = [
+	'https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md',
+	'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md',
+	'https://cdn.staticaly.com/gh/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md',
+	'https://evilvibes.com/list/public-resolvers.md',
+]
+cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+refresh_delay = 72
+prefix = 'public-'
 
 [sources.'opennic']
-	urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/opennic.md', 'https://download.dnscrypt.info/resolvers-list/v2/opennic.md']
-	minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-	refresh_delay = 72
-	cache_file = '/var/cache/dnscrypt-proxy/opennic.md'
-	prefix = 'opennic-'
+urls = [
+	'https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/opennic.md',
+	'https://download.dnscrypt.info/resolvers-list/v2/opennic.md',
+]
+minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+refresh_delay = 72
+cache_file = '/var/cache/dnscrypt-proxy/opennic.md'
+prefix = 'opennic-'
 
 # 2.0.23 recommended so onions won't be attempted without proxy enabled
 # (5c9edfccfe67474bee2836ada67f955f10e43357)

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;

etc/systemd-resolv.conf-restore.bash

@@ -6,7 +6,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

etc/yum.repos.d/vscodium.repo

@@ -0,0 +1,8 @@
+[gitlab.com_paulcarroty_vscodium_repo]
+name=download.vscodium.com
+baseurl=https://download.vscodium.com/rpms/
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg
+metadata_expire=1h

local/share/applications/README.md

@@ -52,7 +52,8 @@ inode/directory=org.gnome.Nautilus.desktop;
 
 ```bash
 % grep directory /usr/share/applications/mimeinfo.cache
-inode/directory=codium.desktop;org.gnome.Nautilus.desktop;
+inode/directory=codium.desktop
+org.gnome.Nautilus.desktop
 ```
 
 TODO: I wonder if it needs an `update-desktop-database` or similar though.

package.json

@@ -2,6 +2,7 @@
   "devDependencies": {
     "prettier": "3.2.5",
     "prettier-plugin-nginx": "1.0.3",
+    "prettier-plugin-sh": "0.14.0",
     "prettier-plugin-toml": "2.0.1"
   }
 }

pnpm-lock.yaml

@@ -13,6 +13,9 @@ importers:
       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)
       prettier-plugin-toml:
         specifier: 2.0.1
         version: 2.0.1(prettier@3.2.5)
@@ -30,12 +33,27 @@ packages:
         integrity: sha512-DV/Re3DPVY+BhBtLZ3dmP4mP6YMLSsgq9qGLXwOV38lvNF/fBlgvQswzlXmzCEefL/3q2eMoefZpOI/+GLuCNA==,
       }
 
+  mvdan-sh@0.10.1:
+    resolution:
+      {
+        integrity: sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==,
+      }
+
   prettier-plugin-nginx@1.0.3:
     resolution:
       {
         integrity: sha512-vV5q85s8XnV6NEgvz1gVLfZhmxAxY03MyOYj2ApBpjFkbs00lRsRkTmqO9L39ADuD18z1RRCcfZ3eVxKhI/nqg==,
       }
 
+  prettier-plugin-sh@0.14.0:
+    resolution:
+      {
+        integrity: sha512-hfXulj5+zEl/ulrO5kMuuTPKmXvOg0bnLHY1hKFNN/N+/903iZbNp8NyZBTsgI8dtkSgFfAEIQq0IQTyP1ZVFQ==,
+      }
+    engines: { node: ">=16.0.0" }
+    peerDependencies:
+      prettier: ^3.0.3
+
   prettier-plugin-toml@2.0.1:
     resolution:
       {
@@ -53,6 +71,19 @@ packages:
     engines: { node: ">=14" }
     hasBin: true
 
+  sh-syntax@0.4.2:
+    resolution:
+      {
+        integrity: sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==,
+      }
+    engines: { node: ">=16.0.0" }
+
+  tslib@2.6.3:
+    resolution:
+      {
+        integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==,
+      }
+
 snapshots:
   "@taplo/core@0.1.1": {}
 
@@ -60,11 +91,25 @@ snapshots:
     dependencies:
       "@taplo/core": 0.1.1
 
+  mvdan-sh@0.10.1: {}
+
   prettier-plugin-nginx@1.0.3: {}
 
+  prettier-plugin-sh@0.14.0(prettier@3.2.5):
+    dependencies:
+      mvdan-sh: 0.10.1
+      prettier: 3.2.5
+      sh-syntax: 0.4.2
+
   prettier-plugin-toml@2.0.1(prettier@3.2.5):
     dependencies:
       "@taplo/lib": 0.4.0-alpha.2
       prettier: 3.2.5
 
   prettier@3.2.5: {}
+
+  sh-syntax@0.4.2:
+    dependencies:
+      tslib: 2.6.3
+
+  tslib@2.6.3: {}

rc/bashrc

@@ -584,7 +584,7 @@ if hash pnpm 2>/dev/null; then
 	alias npx=pnpx
 	alias pnpmx=pnpx
 	if ! hash prettier 2>/dev/null; then
-		alias prettier="pnpm exec prettier"
+		alias prettier="pnpm exec prettier --cache --ignore-unknown"
 	fi
 fi
 

rc/zshrc

@@ -574,7 +574,7 @@ if hash pnpm 2>/dev/null; then
 	alias npx=pnpx
 	alias pnpmx=pnpx
 	if ! hash prettier 2>/dev/null; then
-		alias prettier="pnpm exec prettier"
+		alias prettier="pnpm exec prettier --cache --ignore-unknown"
 	fi
 fi