rolling update in 20240711

Signed-off-by: iosmanthus <[email protected]>

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "God does not play dice";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs?rev=ae784887524c9c3f079c6d4c4444586a434e24e7";
 
     master.url = "github:NixOS/nixpkgs";
 
@@ -151,8 +151,8 @@
             "lens"
             "neovim"
             "nixos-artwork"
-            "nixUnstable"
             "oh-my-zsh"
+            "openssh"
             "ripgrep"
             "rofi"
             "rust-analyzer"
@@ -216,6 +216,7 @@
             {
               nixpkgs.overlays = [
                 self.overlays.default
+                self.overlays.unstable
               ];
             }
           ];
@@ -243,10 +244,12 @@
             self.nixosModules.o11y
             self.nixosModules.subgen
             self.nixosModules.unguarded
+            self.nixosModules.chinadns
 
             {
               nixpkgs.overlays = [
                 self.overlays.default
+                self.overlays.unstable
               ];
             }
           ];
@@ -274,6 +277,7 @@
             {
               nixpkgs.overlays = [
                 self.overlays.default
+                self.overlays.unstable
               ];
             }
           ];
@@ -296,6 +300,7 @@
             {
               nixpkgs.overlays = [
                 self.overlays.default
+                self.overlays.unstable
               ];
             }
           ];
@@ -312,6 +317,7 @@
       in
       {
         devShells.default = pkgs.mkShell {
+          hardeningDisable = [ "fortify" ];
           buildInputs = with pkgs; [
             fd
             gnumake

infra/aws-lightsail/terraform.tfvars.json

@@ -1,7 +1,7 @@
 {
-	"ip_revision": "ENC[AES256_GCM,data:0A==,iv:6QBpGtIcx58D5sZpKx0AisCET1Tp3re/sLgTsA6ciwY=,tag:xv/9buZ6BTPKs8AHqAIS0w==,type:float]",
-	"aws_access_key": "ENC[AES256_GCM,data:EYEzLrlXQGCOxr33sTbQIzQTlMk=,iv:SaaKSQQ+GnkDKChKlK57DLWymnLRaq/kIg6rq2PsBFY=,tag:31mcliZ5ALy2Mt85r7BdKQ==,type:str]",
-	"aws_secret_key": "ENC[AES256_GCM,data:lwjwzJhJb29whLQbZKxshIAnA2zsizORvlx2Bl79qO/GssAx5rr/ew==,iv:DmP2zQjRSKq/eFh54nmTwOO+1uQYR39Vm7esuX3oa58=,tag:AApHq+s4+QkZlea0HXtnHA==,type:str]",
+	"ip_revision": "ENC[AES256_GCM,data:GQ==,iv:pi6APwp2YjbW5q/xipTT74GguasuRiw9IvjOyx1PxoU=,tag:U+PIWfJunFW7z2wOUnoIew==,type:float]",
+	"aws_access_key": "ENC[AES256_GCM,data:3H9SezgpTTh6chCCAVaEMTMnxIQ=,iv:wPbvDY6xNGldBWN2Ip1RxWFukexuz4Wh47iWjk6ytlQ=,tag:qhvQ7qx/dlD0xGBAwr+t5g==,type:str]",
+	"aws_secret_key": "ENC[AES256_GCM,data:U6UgVONBIbJVEBRghTAYbfLpeg0d0HuMQ3M6Bv/KqUayY2yoIEGOuA==,iv:ETIjLewXDlB0Uboz0FpoYlepZycl0J3T4qktcAhe+EY=,tag:hhq23IkvktafuhIStX/1tQ==,type:str]",
 	"sops": {
 		"kms": null,
 		"gcp_kms": null,
@@ -10,11 +10,11 @@
 		"age": [
 			{
 				"recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvcXFtWTQ2NFhuOG9UTnpV\nSnp5aWxTR3hCZ3lqbUFUM0pWMy9SbmZVTnlnCmlSNHZKdVVLNWJnbWZrSmQxUElR\nbmNSUGk3cjFta3JHNGtOSkQrU09LL0UKLS0tIGd4K0YxVkVGUkQvdktyS3pTUktm\ndHNnU2FCbVRPY3l0L21LWUtRYnk5VDQKqQ3b3RWwrcQs/S/7OYVz9cCAziCZfbet\nAVT0mzqfv1mka8hY5d9ox/4HU7UKo7+YTGrnFbchsx2m84RvSK3GKQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlcExzY2lBRm5lamJPNkJa\nQjVmR2FXeWc4TC90Wk1hNjZPTFY2REJDbFZjCjVqa2xOcG9vaHR5WHR2YkRzUUF6\nK3BDYnFBRTlkUXgrUG5XMHpuakY2ZXMKLS0tIG5hT0phak51emlBVUtXdnBhS3pk\naFA3amtUTGpiZkVVb2UxZnBDTG1iVkUK51kMQATV3+1jbdGvki9UCs1CcLurWCni\nyfUFA7ubIWcxWHKGQXvpWYOWwHGGXNUV+SGxikdNMP9QuxcO0UBHaQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2024-05-07T09:57:32Z",
-		"mac": "ENC[AES256_GCM,data:ymS1nZe8g9ywgPzevFTe+NZCJtX7dyK/abQMqbGx2Ocz3nrwMKYZiMhA6dF7UDyppP5WWt7i3EBX53sc+ZpScGkExoW3V819+AQPFOpcelSVS1R8qiDCByCzJfQAZKxwzoKkpAvks9HX9kUaaPxJkg6I55/gIp9fJxNon3iDAYY=,iv:yuP3FyRDJHsuTsQEyycspD8QOgFGjZyTKsWG8snyPrc=,tag:NssrLGQA5cv1Vwox4p4fbg==,type:str]",
+		"lastmodified": "2024-07-03T16:57:04Z",
+		"mac": "ENC[AES256_GCM,data:z3DgJxlJwwMh5I7SxgeZr/ADB8RaiU18777mPlhFTmWdiZw4iAfYjVz+NsVCaLsolc1BpJVeVG7y2E0vDXGgy+XfFYyUSXPr1FiY1BLxImS00YDviW1tFxZifd8zqC2MOz2BciVxhJOqNs5/DpiMnl8+8d60MotKm80XHigGe9s=,iv:HWRwikcsTEtfY9YMnAVQwxMSX4sjTWOBaL2l+Lhm+6k=,tag:dxEeZONENFS3uERr7MsI4A==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.8.1"