From f16d8db3aa30824ddd783a6a5c420f2de2a9e1a4 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 20 Jun 2026 11:19:15 -0400
Subject: [PATCH] [flake] format

---
 data/oidc.nix                              | 4 +---
 hosts/marvin/services/paperless.nix        | 4 ++--
 hosts/marvin/services/pinchflat.nix        | 2 +-
 neovim/languages/css.nix                   | 2 +-
 nixosModules/services/voidauth/default.nix | 3 +--
 packages/grimmory/package.nix              | 1 -
 packages/grimmory/update.sh                | 5 +++--
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/data/oidc.nix b/data/oidc.nix
index d4dba358..a912154c 100644
--- a/data/oidc.nix
+++ b/data/oidc.nix
@@ -4,9 +4,7 @@
   ...
 }:
 let
-  clientList = lib.concatLists (
-    lib.mapAttrsToList (_: v: (v.config.dish.oidcClients or [ ])) self.nixosConfigurations
-  );
+  clientList = lib.concatLists (lib.mapAttrsToList (_: v: (v.config.dish.oidcClients or [ ])) self.nixosConfigurations);
 in
 {
   flake.data.oidcClients = clientList;
diff --git a/hosts/marvin/services/paperless.nix b/hosts/marvin/services/paperless.nix
index 8c46e88c..dad0e2d7 100644
--- a/hosts/marvin/services/paperless.nix
+++ b/hosts/marvin/services/paperless.nix
@@ -73,11 +73,11 @@ in
   '';
 
   age.secrets = mkServiceSecrets "paperless" ./secrets [
-    # keep-sorted true
+    # keep-sorted start
     "admin-password"
     "oidc-secret"
-    "secrets"
     "secret-key"
+    "secrets"
     # keep-sorted end
   ];
 }
diff --git a/hosts/marvin/services/pinchflat.nix b/hosts/marvin/services/pinchflat.nix
index 87563750..499d1abd 100644
--- a/hosts/marvin/services/pinchflat.nix
+++ b/hosts/marvin/services/pinchflat.nix
@@ -42,7 +42,7 @@ in
   # tsnsrv sidecar
   services.tsnsrv.services.yt = {
     urlParts = {
-      port = d.port;
+      inherit (d) port;
     };
   };
 
diff --git a/neovim/languages/css.nix b/neovim/languages/css.nix
index 7549411c..d4666ca3 100644
--- a/neovim/languages/css.nix
+++ b/neovim/languages/css.nix
@@ -7,8 +7,8 @@ let
         [
           # keep-sorted start
           "css"
-          "javascriptreact"
           "javascript"
+          "javascriptreact"
           "svelte"
           "typescript"
           "typescriptreact"
diff --git a/nixosModules/services/voidauth/default.nix b/nixosModules/services/voidauth/default.nix
index 7f42ae81..db9bab43 100644
--- a/nixosModules/services/voidauth/default.nix
+++ b/nixosModules/services/voidauth/default.nix
@@ -10,8 +10,7 @@ let
   cfg = config.dish.voidauth;
   dlib = self.lib;
 
-  nameToEnvVar =
-    name: if builtins.match "[A-Z0-9_]+" name != null then name else dlib.toUpperCamelCase name;
+  nameToEnvVar = name: if builtins.match "[A-Z0-9_]+" name != null then name else dlib.toUpperCamelCase name;
 
   configEnv =
     (lib.concatMapAttrs (
diff --git a/packages/grimmory/package.nix b/packages/grimmory/package.nix
index a57e4a28..96aab8d6 100644
--- a/packages/grimmory/package.nix
+++ b/packages/grimmory/package.nix
@@ -14,7 +14,6 @@
   pkg-config,
   gradle_9,
   jna,
-  writableTmpDirAsHomeHook,
 }:
 let
   pnpm = pnpm_11;
diff --git a/packages/grimmory/update.sh b/packages/grimmory/update.sh
index 4359e0d2..83e98874 100755
--- a/packages/grimmory/update.sh
+++ b/packages/grimmory/update.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p nodejs curl nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher
+# shellcheck shell=bash
 
 set -eou pipefail
 
@@ -7,11 +8,11 @@ PACKAGE_DIR=$(realpath "$(dirname "$0")")
 
 nix-update --flake "$UPDATE_NIX_PNAME" || true
 
-NEW_VERSION=$(nix eval --raw -f. $PACKAGE_NAME.version)
+NEW_VERSION=$(nix eval --raw -f. grimmory.version)
 echo "New version is: ${NEW_VERSION}"
 
 if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
-    echo "${PACKAGE_NAME} is up-to-date: ${PACKAGE_VERSION}"
+    echo "grimmory is up-to-date: ${NEW_VERSION}"
     exit 0
 fi
 
-- 
2.51.2