diff --git a/data/oidc.nix b/data/oidc.nix index 15cb8dd7..12e38194 100644 --- a/data/oidc.nix +++ b/data/oidc.nix @@ -4,9 +4,7 @@ ... }: let - clientList = lib.concatLists ( - lib.mapAttrsToList (c: _: (c.config.dish.oidcClients or [ ])) self.nixosConfigurations - ); + clientList = lib.concatLists (lib.mapAttrsToList (c: _: (c.config.dish.oidcClients or [ ])) self.nixosConfigurations); in { flake.data.oidcClients = clientList; diff --git a/devShells/default/default.nix b/devShells/default/default.nix index b4cd9901..f7018eb6 100644 --- a/devShells/default/default.nix +++ b/devShells/default/default.nix @@ -5,6 +5,9 @@ }: pkgs.mkShellNoCC { packages = [ + (pkgs.writeShellScriptBin "an" '' + ${lib.getExe' pkgs.agenix "agenix"} -i ~/.age/age-new $@ + '') # keep-sorted start pkgs.age pkgs.deadnix @@ -19,9 +22,6 @@ pkgs.mkShellNoCC { pkgs.nvd pkgs.statix pkgs.tokei - (pkgs.writeShellScriptBin "an" '' - ${lib.getExe' pkgs.agenix "agenix"} -i ~/.age/age-new $@ - '') # keep-sorted end ]; } diff --git a/flake.nix b/flake.nix index 4835659f..47532b84 100644 --- a/flake.nix +++ b/flake.nix @@ -160,7 +160,10 @@ no-underscore = true; }; jsonfmt.enable = true; - jsonfmt.excludes = [ ".zed/settings.json" ]; + jsonfmt.excludes = [ + ".zed/settings.json" + "packages/grimmory/*.json" + ]; just.enable = true; keep-sorted.enable = true; mdformat.enable = true; diff --git a/hosts/marvin/default.nix b/hosts/marvin/default.nix index 2b1b6e68..33426b1b 100644 --- a/hosts/marvin/default.nix +++ b/hosts/marvin/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { imports = [ # Machine-specific configurations. diff --git a/lib/misc.nix b/lib/misc.nix index 96bff7ae..11be4e3d 100644 --- a/lib/misc.nix +++ b/lib/misc.nix @@ -1,6 +1,6 @@ { self, pkgs, ... }: let - system = pkgs.stdenv.hostPlatform.system; + inherit (pkgs.stdenv.hostPlatform) system; in { /** diff --git a/neovim/languages/python.nix b/neovim/languages/python.nix index da70b21f..bc24ffa3 100644 --- a/neovim/languages/python.nix +++ b/neovim/languages/python.nix @@ -1,5 +1,4 @@ -{ lib, pkgs, ... }: -{ +_: { config.vim = { languages = { python = { diff --git a/packages/anubis-files/src/policies/meta/base.yaml b/packages/anubis-files/src/policies/meta/base.yaml index 0d30524a..34fc26df 100644 --- a/packages/anubis-files/src/policies/meta/base.yaml +++ b/packages/anubis-files/src/policies/meta/base.yaml @@ -45,7 +45,6 @@ action: WEIGH weight: adjust: 5 - # https://developers.cloudflare.com/browser-rendering/reference/automatic-request-headers/ # Block all of this - name: block-cf-browser-rendering-api @@ -54,7 +53,6 @@ - name: block-cf-browser-rendering-bindings expression: '"cf-brapi-devtools" in headers' action: DENY - # Generic catchall rule - name: generic-browser user_agent_regex: >- diff --git a/packages/grimmory/package.nix b/packages/grimmory/package.nix index 9f2d46b1..1967bd19 100644 --- a/packages/grimmory/package.nix +++ b/packages/grimmory/package.nix @@ -11,7 +11,6 @@ pkg-config, gradle_9, jna, - _experimental-update-script-combinators, nix-update-script, }: let @@ -125,11 +124,6 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - # updateScript = _experimental-update-script-combinators.sequence [ - # (nix-update-script { }) - # frontend.updateScript - # finalAttrs.mitmCache.updateScript - # ]; inherit frontend; };