.gitignore

@@ -14,6 +14,7 @@
 !.nvmrc
 !.pre-commit-config.yaml
 !.prettierignore
+!.prettierrc.json
 !.renovate-shared.json*
 !.reuse
 

.pre-commit-config.yaml

@@ -65,10 +65,18 @@ repos:
 
   - repo: local
     hooks:
+      - id: install-dev-deps
+        name: Install pnpm dev dependencies
+        entry: corepack pnpm install -D
+        language: system
+        always_run: true
+        #verbose: true
+        pass_filenames: false
       - id: prettier
         name: prettier
-        entry: corepack pnpx prettier --cache --ignore-unknown --write
+        entry: corepack pnpm exec prettier --cache --ignore-unknown --write
         language: system
+        exclude_types: [json]
 
   # .editorconfig validity checking
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python

.prettierrc.json

@@ -0,0 +1,36 @@
+{
+  "bracketSameLine": true,
+  "endOfLine": "auto",
+  "insertPragma": true,
+  "overrides": [
+    {
+      "files": ".prettierrc",
+      "options": {
+        "parser": "json"
+      }
+    },
+    {
+      "files": "conf/librewolf.overrides.cfg",
+      "options": {
+        "parser": "babel"
+      }
+    },
+    {
+      "files": "conf/autoconfig.js.online",
+      "options": {
+        "parser": "babel"
+      }
+    }
+  ],
+  "plugins": [
+    "@prettier/plugin-ruby",
+    "@prettier/plugin-xml",
+    "prettier-plugin-nginx",
+    "prettier-plugin-sh",
+    "prettier-plugin-toml"
+  ],
+  "proseWrap": "always",
+  "quoteProps": "consistent",
+  "requirePragma": false,
+  "singleAttributePerLine": true
+}

.renovate-shared.json

@@ -13,12 +13,6 @@
       "matchPackagePatterns": [
         "*"
       ]
-    },
-    {
-      "groupName": "all pre-commit updates",
-      "matchUpdateTypes": [
-        "pre-commit"
-      ]
     }
   ],
   "pre-commit": {

conf/sway/config.d/autostart-p2p-communication.conf

@@ -1,4 +1,3 @@
 # Very Important Communication Programs, P2P, not expected to get sold
-# Unmaintained for personal reasons says the flatpak
-#exec --no-startup-id flatpak run --env=TZ=UTC net.jami.Jami
+exec --no-startup-id flatpak run --env=TZ=UTC net.jami.Jami
 exec --no-startup-id /usr/local/bin/briar

etc/opt/chromium/policies/managed/aminda-extensions.json

@@ -133,10 +133,6 @@
       "toolbar_pin": "force_pinned",
       "update_url": "https://clients2.google.com/service/update2/crx"
     },
-    "gphhapmejobijbbhgpjhcjognlahblep": {
-      "blocked_install_message": "Tämä on KDE-talous, jossa kukaan ei tietääkseni käytä GNOMEa. Tämä lisäosa KDEn vastaavasta poiketen on riippuvainen GNOMEsta.",
-      "installation_mode": "blocked"
-    },
     "hojggiaghnldpcknpbciehjcaoafceil": {
       "installation_mode": "normal_installed",
       "override_update_url": true,

package.json

@@ -1,7 +1,11 @@
 {
   "devDependencies": {
-    "@aminda/global-prettier-config": "2024.28.4"
+    "@prettier/plugin-ruby": "4.0.4",
+    "@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"
   },
-  "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903",
-  "prettier": "@aminda/global-prettier-config"
+  "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
 }

pnpm-lock.yaml

@@ -1,3 +1,5 @@
+# @format
+
 lockfileVersion: "9.0"
 
 settings:
@@ -7,17 +9,26 @@ settings:
 importers:
   .:
     devDependencies:
-      "@aminda/global-prettier-config":
-        specifier: 2024.28.4
-        version: 2024.28.4
+      "@prettier/plugin-ruby":
+        specifier: 4.0.4
+        version: 4.0.4(prettier@3.3.2)
+      "@prettier/plugin-xml":
+        specifier: 3.4.1
+        version: 3.4.1(prettier@3.3.2)
+      prettier:
+        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.3.2)
+      prettier-plugin-toml:
+        specifier: 2.0.1
+        version: 2.0.1(prettier@3.3.2)
 
 packages:
-  "@aminda/global-prettier-config@2024.28.4":
-    resolution:
-      {
-        integrity: sha512-VjyTd8fFRnLgZRAMDRr9pm5hknnsVxpTCshvvE7RAiuH72hUzC82rm5vXDJjrhkedWJir2qZjmiC5Vo2LoR4tw==,
-      }
-
   "@prettier/plugin-ruby@4.0.4":
     resolution:
       {
@@ -88,10 +99,10 @@ packages:
     peerDependencies:
       prettier: ^3.0.3
 
-  prettier@3.3.3:
+  prettier@3.3.2:
     resolution:
       {
-        integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==,
+        integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==,
       }
     engines: { node: ">=14" }
     hasBin: true
@@ -116,23 +127,14 @@ packages:
       }
 
 snapshots:
-  "@aminda/global-prettier-config@2024.28.4":
+  "@prettier/plugin-ruby@4.0.4(prettier@3.3.2)":
     dependencies:
-      "@prettier/plugin-ruby": 4.0.4(prettier@3.3.3)
-      "@prettier/plugin-xml": 3.4.1(prettier@3.3.3)
-      prettier: 3.3.3
-      prettier-plugin-nginx: 1.0.3
-      prettier-plugin-sh: 0.14.0(prettier@3.3.3)
-      prettier-plugin-toml: 2.0.1(prettier@3.3.3)
+      prettier: 3.3.2
 
-  "@prettier/plugin-ruby@4.0.4(prettier@3.3.3)":
-    dependencies:
-      prettier: 3.3.3
-
-  "@prettier/plugin-xml@3.4.1(prettier@3.3.3)":
+  "@prettier/plugin-xml@3.4.1(prettier@3.3.2)":
     dependencies:
       "@xml-tools/parser": 1.0.11
-      prettier: 3.3.3
+      prettier: 3.3.2
 
   "@taplo/core@0.1.1": {}
 
@@ -152,18 +154,18 @@ snapshots:
 
   prettier-plugin-nginx@1.0.3: {}
 
-  prettier-plugin-sh@0.14.0(prettier@3.3.3):
+  prettier-plugin-sh@0.14.0(prettier@3.3.2):
     dependencies:
       mvdan-sh: 0.10.1
-      prettier: 3.3.3
+      prettier: 3.3.2
       sh-syntax: 0.4.2
 
-  prettier-plugin-toml@2.0.1(prettier@3.3.3):
+  prettier-plugin-toml@2.0.1(prettier@3.3.2):
     dependencies:
       "@taplo/lib": 0.4.0-alpha.2
-      prettier: 3.3.3
+      prettier: 3.3.2
 
-  prettier@3.3.3: {}
+  prettier@3.3.2: {}
 
   regexp-to-ast@0.5.0: {}
 

rc/zshrc

@@ -30,7 +30,8 @@ UNAME=$(uname)
 
 # enable terminal bell
 
-if [[ -f /usr/bin/xset ]]; then
+if [[ -f /usr/bin/xset ]];
+then
 	(xset b on&)
 fi
 
@@ -80,7 +81,7 @@ zstyle ':completion:*' menu select=2
 if [[ $UNAME != Darwin ]]; then
 	eval "$(dircolors -b)"
 fi
-#zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
 zstyle ':completion:*' list-colors ''
 zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
 zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
@@ -99,17 +100,17 @@ fi
 (uptime&)
 (echo "")
 
-#if [[ $UNAME != Darwin	]] then;
-#	(who -H -w -u|head -n10&)
-#	(echo "")
+if [[ $UNAME != Darwin	]] then;
+	(who -H -w -u|head -n10&)
+	(echo "")
 #	 (last -10 -w -x&)
-#fi
+fi
 
-#if [[ $UNAME = Darwin ]]; then
-#	(who -H -u|head -n10&)
-#	(echo "")
-#	(last -10&)
-#fi
+if [[ $UNAME = Darwin ]]; then
+	(who -H -u|head -n10&)
+	(echo "")
+	(last -10&)
+fi
 
 # Only print motivational phrases if username is aminda or mikaela
 if [[ $(whoami) == aminda ]] || [[ $(whoami) == mikaela ]]; then
@@ -574,7 +575,8 @@ alias mpvm="mpv --no-video"
 alias mpvms="mpv --no-video --shuffle"
 
 # Compatibility with my i3 alsactl mess
-if [ -f ~/.config/asound.state ]; then
+if [ -f ~/.config/asound.state ]
+then
 	alias alsactl="\alsactl -f ~/.config/asound.state"
 fi
 
@@ -643,7 +645,9 @@ function geoip() {
 ## for unit193 ;)
 ## use command "ex" to extract any archive files.
 ## "ex package.zip" for example
-function ex() {
+function ex ()
+
+{
 if [ -f "$1" ] ; then
 case "$1" in
 		*.tar)				tar xvf $1			;;
@@ -660,11 +664,9 @@ function ex() {
 		DIR=${1%%_*.deb}
 		ar xv $1
 		mkdir ${DIR}
-				tar -C ${DIR} -xzvf data.tar.gz
-				;;
+		tar -C ${DIR} -xzvf data.tar.gz		;;
 		*.rpm)				rpm2cpio $1 | cpio -vid	;;
-			*)
-				echo ""${1}" cannot be extracted via extract()"
+		*)	 echo ""${1}" cannot be extracted via extract()"
 ;;
 	esac
 	else