Merge branch 'master' of git.uninsane.org:shelvacu/nix-stuff

common/defaultPackages.nix

@@ -21,6 +21,7 @@ lib.mkMerge [
         tcpdump
         cargo
         wayland-utils
+        kanidm
       ])
       ++ [
         inputs.nix-search-cli.packages.${pkgs.system}.default

fw/default.nix

@@ -88,7 +88,6 @@
       kdePackages.elisa
       haruna
       kdePackages.dragon
-      kanidm
     ])
     ++ [ ];
 

scripts/update-git-keys.nix

@@ -25,7 +25,7 @@ writers.writeBashBin "update-git-keys" ''
     url_keys="$url_base/user/keys"
   fi
 
-  if [ $domain = "git.uninsane.org" ] || [ $domain = "sr.ht" ]; then
+  if [ $domain = "git.uninsane.org" ] || [ $domain = "sr.ht" ] || [ $domain = git.for.miras.pet ]]; then
     authorization_name="token"
   else
     authorization_name="Bearer"

secrets/misc/git-keys.json

@@ -1,5 +1,6 @@
 {
 	"git.uninsane.org": "ENC[AES256_GCM,data:g1oZA7s16sl6tBsUy+aAUChYBomgxht08dzghBakmJ/13YrM/Pf7WQ==,iv:v3CXUaLwIdEtg6ZWiCqqZ1JSkWOlnWnGSOzNVAx5gvs=,tag:jkQGgxRMBggokRNUdW2jLQ==,type:str]",
+	"git.for.miras.pet": "ENC[AES256_GCM,data:9X8Aq+ts0BYK/Z9C5oxdbup9tbnT272Gsdbh/hiabNGa/wutMnIOeA==,iv:pmOnj2TFe1Q4S63i1Q5ukYEf5ntryA6g1YFPYsD50lw=,tag:v0F2XHhSVCBsicqEiDOlmw==,type:str]",
 	"gitlab.com": "ENC[AES256_GCM,data:A2+dsAgvVJsqgGOHcPsw7F5bSTg8H3icd+g=,iv:v9QVy7vP/XEHw0lHBjedvWFrsGvyDlAEF+yFL1voiQc=,tag:0kqgQOIn90MBjiNRHjiRrg==,type:str]",
 	"github.com": "ENC[AES256_GCM,data:fpY8KxwIYGvIWAHKH7cmwCO4j7fPx+625Buvhu4OdJIpcDXJrpjTsQ==,iv:4W2YvZ01XjzJUX3yXx9H+kxtylYRma4wA/YWL2W6kPc=,tag:WswVoBWgzjrpz9nPQfVV3w==,type:str]",
 	"sr.ht": "ENC[AES256_GCM,data:fsYdw51hHbBytSnWv8LE0iAe8RCNSiBOQnkglJMrFh3ClBfLeyVCN7YLDp7JiiXtFlTzZ17OVO2gTkKxY7hEmDk5QeimaN8iZp1AuQKhNQOsEV9M6bRQgTeW0h7e0gcGr7kG,iv:SMWvQlnbIVs8o7YqlB9G0hWfq6F1Xhqb5jGi30Pe/Pg=,tag:UMAfeDLWFz7zGWvzwLMP3A==,type:str]",
@@ -46,10 +47,10 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPek9CVk5pQW1EUUhabW5E\nTWFjdFdlVVFnZlcvQWlOTk5YZTVTRWdMMmtRCkJwWjlWREdjRUhEL2R4bFRBQ3Aw\nZjdJMCtVZDErZE5wcnloR2lvVnJHSDgKLS0tIDAwajE2YTA4UFo1SmJEVUtpN2hX\nMkkzYjZOVDYvSlRGT3RJTzdySlJleXMKor4NR2gIkfvDi25eKrzLki+biWf3dVZS\niCSBxy+tpbtiO9fK8LPrz9jJp1tBism7VTIF6WBuj97GjMGHIOz43Q==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2024-12-03T02:00:12Z",
-		"mac": "ENC[AES256_GCM,data:if2soypQVleS/CIYQVa2ziBzadm3xrWCleHh/JrwJtqblZ99OSbIE/wIUkanNum8jC6sa6V7AE88ZeHP+pqDBha0hZVtIQqhN9YkVuKXCM2l1sHNy/RM/GDYksMLij+RD1IWPY/NyIKBEouVmuGrc227D21D1r/fIsSllOo3g7I=,iv:h479usI8YoiAT4ddFHiUG9VyUBs8rrL55GcNHfxUK4A=,tag:rmxLYKRPV0/iH3bc37rxdg==,type:str]",
+		"lastmodified": "2025-02-15T06:22:16Z",
+		"mac": "ENC[AES256_GCM,data:rP+kqJ2pQHWwU4F0J9IFR2uR+yWesv/NdjHfU38Px9/rN3BWwGVd/mCVE7QiTgjxfzRFEBiBia4s8vWUzhLb0J0MDsZlf4P+sHTnm4hN41SwxNUarLS4m/0wJFjM80Bq4XqOEi/qEqHHPy40dOEAKIcadoAaZsd5vvXpgqPWx3s=,iv:FDIUYwfmrHtSn2Ng8VYTfAPMFw+q7jQDbFOmjf0Br10=,tag:ZrlCrupz0ewNXbFuoX1gdg==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
-		"version": "3.9.1"
+		"version": "3.9.4"
 	}
 }