change a shared secret

feat(formatter/deadnix): ignore _ bindings
a bit more mercy :-)
2024-11-16 20:56:53 +01:00 · 2024-11-16 20:56:29 +01:00 · 2024-11-16 20:55:43 +01:00
6 changed files with 168 additions and 217 deletions
--- a/flake.nix
+++ b/flake.nix
@ -355,6 +355,7 @@
                    formatter = {
                      deadnix = {
                        priority = 1;
+                        options = [ "--no-underscore" ];
                      };

                      nixfmt = {
--- a/nix/devShells.nix
+++ b/nix/devShells.nix
@ -83,7 +83,6 @@
      screen

      inputs'.nixpkgs-kanidm.legacyPackages.kanidm
-      inputs'.nix4vscode.packages.default
    ];

    # Set Environment Variables
--- a/nix/home-manager/programs/vscode/default.nix
+++ b/nix/home-manager/programs/vscode/default.nix
@ -1,4 +1,10 @@
-{ pkgs, repoFlake, ... }:
+{
+  config,
+  pkgs,
+  repoFlake,
+  lib,
+  ...
+}:
 let
  pkgsVscodium = import repoFlake.inputs.nixpkgs-vscodium { inherit (pkgs) system config; };
 in
@ -48,19 +54,43 @@ in

            golang.go
            jeff-hykin.better-go-syntax
-
-            ibecker.treefmt-vscode
          ]
        )
      )
-      ++ [
-        (pkgsVscodium.vscode-utils.extensionFromVscodeMarketplace {
-          name = "markdown-oxide";
-          publisher = "felixzeller";
-          version = "1.1.0";
-          sha256 = "07l37hkg106m3nl9530l7i39iw1kibckv1zi4n23gbp7srdrwbs3";
-        })
+      ++ (
+        let
+          nix4vscodeConfig = pkgs.writeText "nix4vscode.toml" ''
+            vscode_version = "${config.programs.vscode.package.version}"
+
+            [[extensions]]
+            publisher_name = "FelixZeller"
+            extension_name = "markdown-oxide"
+
+            [[extensions]]
+            publisher_name = "ibecker"
+            extension_name = "treefmt-vscode"
+          '';
+          nix4vscode =
+            pkgs.runCommand "nix4vscode.nix"
+              {
+                __noChroot = true;
+                nativeBuildInputs = [ repoFlake.inputs.nix4vscode.packages.${pkgs.stdenv.system}.default ];
+              }
+              ''
+                export RUST_BACKTRACE=full
+                export HOME=$(mktemp -d)
+                nix4vscode ${nix4vscodeConfig} > $out
+              '';
+          nix4vscodeExtensions = builtins.removeAttrs (pkgs.callPackage nix4vscode { }) [
+            "override"
+            "overrideDerivation"
          ];
+          nix4vscodeExtensions' = lib.attrsets.mapAttrsToList (
+            _: v: builtins.head (builtins.attrValues v)
+          ) nix4vscodeExtensions;
+        in
+        nix4vscodeExtensions'
+      );
    mutableExtensionsDir = true;
  };

--- a/nix/home-manager/programs/vscode/nix4vscode/config.toml
+++ b/nix/home-manager/programs/vscode/nix4vscode/config.toml
@ -1,9 +0,0 @@
-vscode_version = "1.94.2"
-
-[[extensions]]
-publisher_name = "FelixZeller"
-extension_name = "markdown-oxide"
-
-[[extensions]]
-publisher_name = "ibecker"
-extension_name = "treefmt-vscode"
--- a/nix/home-manager/programs/vscode/nix4vscode/default.nix
+++ b/nix/home-manager/programs/vscode/nix4vscode/default.nix
@ -1,72 +0,0 @@
-{ pkgs, lib }:
-let
-  inherit (pkgs.stdenv)
-    isDarwin
-    isLinux
-    isi686
-    isx86_64
-    isAarch32
-    isAarch64
-    ;
-  inherit (pkgs) vscode-utils;
-  merge = lib.attrsets.recursiveUpdate;
-in
-merge
-  (merge
-    (merge
-      (merge
-        {
-          "felixzeller"."markdown-oxide" = vscode-utils.extensionFromVscodeMarketplace {
-            name = "markdown-oxide";
-            publisher = "felixzeller";
-            version = "1.1.0";
-            sha256 = "07l37hkg106m3nl9530l7i39iw1kibckv1zi4n23gbp7srdrwbs3";
-          };
-        }
-        (
-          lib.attrsets.optionalAttrs (isLinux && (isi686 || isx86_64)) {
-            "ibecker"."treefmt-vscode" = vscode-utils.extensionFromVscodeMarketplace {
-              name = "treefmt-vscode";
-              publisher = "ibecker";
-              version = "2.1.0";
-              sha256 = "1r17wjpw8xiha5r9h3146facxghpcp416zf8551sw93cmam9ky6j";
-              arch = "linux-x64";
-            };
-          }
-        )
-      )
-      (
-        lib.attrsets.optionalAttrs (isLinux && (isAarch32 || isAarch64)) {
-          "ibecker"."treefmt-vscode" = vscode-utils.extensionFromVscodeMarketplace {
-            name = "treefmt-vscode";
-            publisher = "ibecker";
-            version = "2.1.0";
-            sha256 = "0swvl7fkjcwp43grnrhnmy60a5m3hfwawk204byi8hhbczy131li";
-            arch = "linux-arm64";
-          };
-        }
-      )
-    )
-    (
-      lib.attrsets.optionalAttrs (isDarwin && (isi686 || isx86_64)) {
-        "ibecker"."treefmt-vscode" = vscode-utils.extensionFromVscodeMarketplace {
-          name = "treefmt-vscode";
-          publisher = "ibecker";
-          version = "2.1.0";
-          sha256 = "1swq9hy6a9nzkrn07j21g59pyk2m7aqsfi1pphl9l9y8p4zwiaqm";
-          arch = "darwin-x64";
-        };
-      }
-    )
-  )
-  (
-    lib.attrsets.optionalAttrs (isDarwin && (isAarch32 || isAarch64)) {
-      "ibecker"."treefmt-vscode" = vscode-utils.extensionFromVscodeMarketplace {
-        name = "treefmt-vscode";
-        publisher = "ibecker";
-        version = "2.1.0";
-        sha256 = "1xg3wnn3f1kvsz5a09l0cjpzfm3l9va73cahbvl14mx3n6734r2m";
-        arch = "darwin-arm64";
-      };
-    }
-  )
--- a/secrets/shared-users.yaml
+++ b/secrets/shared-users.yaml
@ -1,6 +1,8 @@
 #ENC[AES256_GCM,data:aqlLlXgwwtjBYxytS2H33KbN0z8pHijFXKBAPQyQ7cxE8iO6tDfn/3kEVaEa1YaiYUMXACX2Ow==,iv:uKTUsccWAqrBkdG/ymCZB1pcumRreGv/2rIn6YG8Y7c=,tag:NWDO4dPRA45Ki4ymGblGIg==,type:comment]
 sharedUsers-root: ENC[AES256_GCM,data:RhMqzHmMzsPZnskGAKQ5GEagkAmtCqbp3FI4XPWweq6U8WcML+XEOKBfRoemK6yMHpSobBUPEHudNDeVxhGLH1VREmO6+JVZ/3dz44qWudhyuAj2CHiVkVgMlSfOKIbY9FLLxXxfySnEsQ==,iv:EYWeRKI+nFpEkxtBJ57xH6V4arE+hVAHy5ht9v8P1oQ=,tag:I5WA5+FjJ3lF30dth3H2ug==,type:str]
-sharedUsers-steveej: ENC[AES256_GCM,data:vuvklQJFb0kziB/qr7LNiTB30T/1UmZUV3YE3fFpKLZSlxqwYR7e8pnj94hFMhCtPquw3qdtB8vFAIQSb2LxXUgsfNo1bmkGJU86vz3Vy9Js7oua7KlLyZjoFNpMBgbD7swyXns=,iv:nsymZS1wQ7QSL5ZqoVx/ygaP4UR/e0cYIXHg+UyhbYs=,tag:+/N1QRESOUUK/XJXgiyFfg==,type:str]
+#ENC[AES256_GCM,data:d9jstVxMebNWmJHo79RF0YdurMqwRoDrFzbwjoQ=,iv:UG+qk8hc/WiCviJSCmrUyQZATDD1gBhqiYU6spf7Zo4=,tag:4HNfJQh+3GEP+MHqg1KNHA==,type:comment]
+#ENC[AES256_GCM,data:4FjqAy/pZMkBFC7aq6Jqx+TqCtU=,iv:iWxPm8etDkAIuz9op4ck5AgszLuEN9cXXixzO705afc=,tag:MC03p7Kqk0srtDjbov91LA==,type:comment]
+sharedUsers-steveej: ENC[AES256_GCM,data:almzynLh7RHcjTFOQWVaGk027uAanFcE+AYVhcbzSs5Xwd9sZR5+Ckbb//YxT/Imz9WKVG7z+bxPuhYPgbzUPCyxUu6/X9ZeCF0gmffyTbXVQHpo2W+71Zcob2Mbt9yMAF1146Dr1Q5R2w==,iv:fHMmtO3U6f/0ZNjxcvm0vOx/W/BYWvpD3WtzLNejGpA=,tag:tsLziHECG323TCKBLO6FzA==,type:str]
 sharedSshKeys-steveej: ENC[AES256_GCM,data:Cj8aoHYN95kOuFwMIr+gYTtvE2MNMT6WhHg+r5cEvfgLbI6EJQdMBU30nhJZ8S7uRwJwyVEnqw9qgaZYVorXrIh4oZoQBT6g0UGQ5b5lhtfj86omP7w/NukvpjUPBJEUL+JgvaNGsAbAmExPb1yQY9f/kn2QuyY31pTywcV6qeSHHlK8I2cpei5RxtuG2IX+EjvDXZ3CtQwLY7YrhLvv0K+N8XlEusnytNkXLfjRgd0dJqNLQdkuzrjFPQnuzkxoBBmwfheO8CaTpmH1C5z/dbmeIP5H9GY2gnBCu5xB2zp8ZerVi2E3teW5EZ+Sh+lz/5DOuVpPn3G8W7l4fTM8iX2IHeakjlpYewx1wmW9SZdV/zxyt5rQUtmMj3F+IVktbOWsOyXwSz0CDUlKkVKJdvzATlWdIjteKTwKEgS8RWjg5H7mGylfxyg6YrHYAHTZjC4J1Qz2CwWmAFxzpFCkHvF6QwAOUg+ST+crfw4DiSamb6SKjIg7LNz6VZTOeji6+71Q59u6g2RcdgNowzgrrQCAw7qHnewbFX/2IOW+pdASCB/q9/7218yM6fzMtcPHPiDpZ2tLHQd+45zxZpbUXXCNdNm5v9OTjjK+uA0ARLOVCw5gtd2FbKsJcwyMhXY/h028tgdRhsXIalLolorrYBPx9hR+UHU0TNihspajoNYJCTuJccMiwo8N9AT1DIdUXcOxrQL80RvWY0S6rBzES3q7a91aC/lGEmS/beO7MDgOKaEV+qwPZOLOZXWAesqsR3sKzpOdPx1gFrLvX6vIhAtzuteH0KvKujIAhCg0sEz3Ct/A1S2uNtohz8CstvEEqP6GiR6/X+sQRgxOcXGPQglz68FFKOErIz5XZJBz5+14u/lady1jxhXnVW0cxZDgmqmAvNbrQ9JjNgBvremaDUvuO5R5V5K4MHAMsNQ5yxE9iScXEfwmEvo+Gj4huJwXvwLDE/1TqIaQWX6LfZKOOZ93ivhj7eEiAz7TsLojdNUeDhnWGOYcWbEkMNzYyPb7obN/HgKzcuSixpYm+IZu4sOzXyoO5Lblzd7OObtG4P9jIj4cdxF+vm/s6MYYxtst7jRwzcv9vMLETDXx40IOSqTo2e8New2e/D003T4jx2sis0+68Iyg9m8ltEYb85v6oGFshIdafIGKBaNHm/zIL4Dw03M8kxxfuVuWZD8S2P3bnfryfA4lbOZttv2DnlPZf/Dfb+Ax5qTe5yn4uzLYDTqq9rIqdoNYUmx1OaxGa69oTIqCpL7FC6xe+9NnTEdojl9svZUhtGfThiphYcK72lryqrTyYVuAOa3WjZtHgUJ5lU8x79eExXyDexmC4RNDszar+qMiwlzMC977qsKczfTGe2audm5PLaLTYhWSOZ1p83d/xhFWhLmqjqHrPF5kYrnG+W4ZuVIqxJOrLHQhseKc4fFZrF/XCusgIcoDEq81M/EmHeEDcuWEYldn1pjbE8yzb2ZgfG8mycNh8z41lKsalKmesyZs0k0IvWmrdCpLXqWl/TgsPSO1q+zbQHyfiNewoZec3GC8k1k64zrG3CNI8bP40L6i4Uo/GFPS/y0OjgQhww+He0bWY7yP9MKqdbahpdYQE9kYU5yoJTUG+ZYRir6h6o/JmTJQy4QIvwmcx2jiiA5XXpj3cYAJ9/3eHDFCeg==,iv:QeYNlLR97tdC9i5N909GnoNyBwNNiuljF/eVbdhvGXg=,tag:lBWDaaZMQRPX/4Ln+oUQPA==,type:str]
 #ENC[AES256_GCM,data:8u2UAE6lXi0e6qKJxB3VP1k7hmfUYRcejXoR7K6NIQ9E7AqOlMiLDyQFw77NBlqpy0G6mPVOnC+XskGAscm3TLFzs7+o+/i0IxH7uDPwoh+U,iv:n4wheHkpPbnKeXb4DTxwks2bph4LO6xQW6LcrlA4jKU=,tag:mgwa7rYvqoubFdQDXJADZQ==,type:comment]
 sharedUsers-radicale: ENC[AES256_GCM,data:Mn1QIwQDX0ZnZ0Jbk1RYY60k+XbbGPYYf+NG3xQz3oR14CqSVy3hjQEkqcezwj/v2ELrLWid2hK+lDtY,iv:TNoJ7Kq3WDkkPBLG3a+N/A8yBZcx7Gc0jaBToYX3Y5M=,tag:VU5P4YtzMv1FVc3ugig8TA==,type:str]
@ -112,8 +114,8 @@ sops:
            T1drTFFKUFR2MVVtNGhqYmFCQVduWkUKOLhOpIBiYaOZ7JR1X3WYVUq7IESdu2pw
            bAsmmjFymFcLvlm2IdFxb1xEh3hj1c6TdzeKkU1dnUSe8N4wnCQJpg==
            -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2023-07-06T20:14:22Z"
-  mac: ENC[AES256_GCM,data:GPWu5DjjJ1ki+HRuedGdDCt+2V0RPbOsD/yWJxPIkgu5923vnF8y9y4V6e6+ZsTqHv4hsKeCjKtUnh2Ldn+xadwJmqrIxyJ8NzH5TOvcBxAab9cJCp/yKENw0O1WMUTlDPelvQKMDwbgiebaVVfxbQPUEfJGOgkHkyXrgqN94FU=,iv:h9YALYahUl7mRJmZKjArEfaMrfW9YZkVYd2CEooF13Q=,tag:wotqxup/ouG/bEVOZCs19w==,type:str]
+    lastmodified: "2024-11-16T19:17:41Z"
+    mac: ENC[AES256_GCM,data:WWOWqwrUtpJWY7o7M6Aac7B9O6tw91yNiL74Fg0TKq4OH/0TGHI7YJK4c9swXs95jctFvFL9qQPTNEENgnqhJyZJGuc2qTsSaKERsSReaV4gURNEm2J2R52EQkyZXRbrn0oSoDazORqRXQo1KvULV75fyIPtsE1OcU/1/TPkWHY=,iv:XwyR6rM+0eTmKg4+vpQx26iKgKm0NL6siKxLoF3MufM=,tag:ks777fUl7uUgn7W48zBoMg==,type:str]
    pgp:
        - created_at: "2024-07-13T14:51:09Z"
          enc: |-
@ -131,4 +133,4 @@ sops:
            -----END PGP MESSAGE-----
          fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B
    unencrypted_suffix: _unencrypted
-  version: 3.7.3
+    version: 3.8.1
Author	SHA1	Message	Date
Stefan Junker	c4abade9e8	change a shared secret	2024-11-16 20:56:53 +01:00
Stefan Junker	1ac1cb45b4	feat(formatter/deadnix): ignore _ bindings a bit more mercy :-)	2024-11-16 20:56:29 +01:00
Stefan Junker	7c08a002cf	feat(vscode): inline nix4vscode call	2024-11-16 20:55:43 +01:00