From ffe25beffa7a9393d18de4740413222d64720c89 Mon Sep 17 00:00:00 2001 From: Yuto Nishida Date: Sun, 28 Sep 2025 16:58:47 -0700 Subject: [PATCH] Debug failing deploys --- flake-profiles/system-ethane/flake.lock | 121 +++++++++++++----------- flake-profiles/system-ethane/flake.nix | 10 +- secrets/milky-way.json | 18 ++-- venus/modules/nixos-darwin/ethane.nix | 4 +- 4 files changed, 82 insertions(+), 71 deletions(-) diff --git a/flake-profiles/system-ethane/flake.lock b/flake-profiles/system-ethane/flake.lock index a5c09f2..769deae 100644 --- a/flake-profiles/system-ethane/flake.lock +++ b/flake-profiles/system-ethane/flake.lock @@ -3,26 +3,30 @@ "cachix": { "inputs": { "devenv": [ + "soup", "devenv" ], "flake-compat": [ + "soup", "devenv" ], "git-hooks": [ + "soup", "devenv", "git-hooks" ], "nixpkgs": [ + "soup", "devenv", "nixpkgs" ] }, "locked": { - "lastModified": 1748883665, - "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=", + "lastModified": 1752264895, + "narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=", "owner": "cachix", "repo": "cachix", - "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe", + "rev": "47053aef762f452e816e44eb9a23fbc3827b241a", "type": "github" }, "original": { @@ -84,7 +88,7 @@ "soup", "devenv" ], - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "soup", "nixpkgs-devenv" @@ -112,7 +116,7 @@ "soup", "devenv" ], - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "soup", "nixpkgs-devenv" @@ -144,7 +148,7 @@ "soup", "fenix" ], - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "nixpkgs": [ "soup", "nixpkgs-devenv" @@ -190,19 +194,21 @@ "devenv": { "inputs": { "cachix": "cachix", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "nix": "nix", "nixpkgs": [ - "nixpkgs" + "soup", + "nixpkgs-devenv" ] }, "locked": { - "lastModified": 1756415044, - "narHash": "sha256-Oj4Tvk1Za5CqGxZ43IoGWBySgfN0/JK+rfb1Tmk59QQ=", + "lastModified": 1759096171, + "narHash": "sha256-LrKYZWHQPozC+u/PQLU7eJb5ViiGNSowL2gLBav4wc4=", "owner": "cachix", "repo": "devenv", - "rev": "c570189b38b549141179647da3ddde249ac50fec", + "rev": "9f8307f84b53b3ff7a7bf94063e10fae3fe74911", "type": "github" }, "original": { @@ -250,22 +256,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -279,7 +269,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -293,7 +283,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_5": { + "flake-compat_4": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -307,6 +297,22 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_6": { "locked": { "lastModified": 1696426674, @@ -324,17 +330,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "soup", "devenv", - "nix", "nixpkgs" ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -346,21 +352,23 @@ "git-hooks": { "inputs": { "flake-compat": [ + "soup", "devenv", "flake-compat" ], "gitignore": "gitignore", "nixpkgs": [ + "soup", "devenv", "nixpkgs" ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -372,6 +380,7 @@ "gitignore": { "inputs": { "nixpkgs": [ + "soup", "devenv", "git-hooks", "nixpkgs" @@ -407,60 +416,68 @@ "nix": { "inputs": { "flake-compat": [ + "soup", "devenv", "flake-compat" ], - "flake-parts": "flake-parts", + "flake-parts": [ + "soup", + "devenv", + "flake-parts" + ], "git-hooks-nix": [ + "soup", "devenv", "git-hooks" ], "nixpkgs": [ + "soup", "devenv", "nixpkgs" ], "nixpkgs-23-11": [ + "soup", "devenv" ], "nixpkgs-regression": [ + "soup", "devenv" ] }, "locked": { - "lastModified": 1755029779, - "narHash": "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=", + "lastModified": 1758763079, + "narHash": "sha256-Bx1A+lShhOWwMuy3uDzZQvYiBKBFcKwy6G6NEohhv6A=", "owner": "cachix", "repo": "nix", - "rev": "b0972b0eee6726081d10b1199f54de6d2917f861", + "rev": "6f0140527c2b0346df4afad7497baa08decb929f", "type": "github" }, "original": { "owner": "cachix", - "ref": "devenv-2.30", + "ref": "devenv-2.30.5", "repo": "nix", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1755783167, - "narHash": "sha256-gj7qvMNz7YvhjYxNq4I370cAYIZEw2PbVs5BSwaLrD4=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "4a880fb247d24fbca57269af672e8f78935b0328", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { "deploy-rs": "deploy-rs", - "devenv": "devenv", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", "soup": "soup", @@ -509,9 +526,7 @@ "chaseln": "chaseln", "check-gits": "check-gits", "dark-notify": "dark-notify", - "devenv": [ - "devenv" - ], + "devenv": "devenv", "fenix": "fenix", "flake-compat": "flake-compat_6", "love": "love", diff --git a/flake-profiles/system-ethane/flake.nix b/flake-profiles/system-ethane/flake.nix index 16d3de2..0a3b553 100644 --- a/flake-profiles/system-ethane/flake.nix +++ b/flake-profiles/system-ethane/flake.nix @@ -10,10 +10,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:cachix/devenv-nixpkgs/rolling"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default"; - devenv.url = "github:cachix/devenv"; - devenv.inputs.nixpkgs.follows = "nixpkgs"; soup = { url = "github:starptr/soup"; @@ -21,16 +19,10 @@ nixpkgs.follows = "nixpkgs"; nixpkgs-devenv.follows = "nixpkgs"; systems.follows = "systems"; - devenv.follows = "devenv"; }; }; }; - nixConfig = { - extra-trusted-public-keys = "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="; - extra-substituters = "https://devenv.cachix.org"; - }; - outputs = { self, ... } @ inputs: let forEachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems); generated = builtins.fromJSON (builtins.readFile ./../../exports/jupiter/generated.json); diff --git a/secrets/milky-way.json b/secrets/milky-way.json index 14b5136..0e3d342 100644 --- a/secrets/milky-way.json +++ b/secrets/milky-way.json @@ -1,27 +1,31 @@ { - "cluster_token": "ENC[AES256_GCM,data:sZRXZZIqTUwUc+AJ5mzBb8KEqviI6dU/wgf1eBSE96yMcRLwN8EqRa1W1LwH6MbCvkowC1o6racfqSJoQarwZIU5nW6tu/E1znZ417UeUU2/5Bx3dBfjhIAcHKay6r2nFZrxQ03DKUdLh6h+,iv:IUSWVsOt1xsTap1w6ydxbEkua/+dOMR6oBBtpssdxlU=,tag:nY3XHvFQVXIoKucuWGNHUg==,type:str]", + "cluster_token": "ENC[AES256_GCM,data:ioTCyZyYBPN5AH8OCB37LmfYnWN143L9HIFkHaBEhP7Ty6GVIEipX/ZQ2317+vB45YpsZmKmd3tWif4/a7+pWP1MG9vZhW+GQ4lLgXMT8ooUCUMRuT+OCFwbXhQqQR/kTfzJR7L0LWMh3bCy,iv:8J7m63ahHEXNBmn7cFWXGg6OH5/Yi7PzGwij34tJ2Gw=,tag:PS1VVdT0d7ANZONj/26lVw==,type:str]", "k3s_vpn_auth": "ENC[AES256_GCM,data:xiSoheuulzO5ik8xZ0+kyI9UmfDtkFf+fHBdjaUAb2rohfJjc0jcgx3b5J6IvcZ4EsGItuCxQsS1yPvlU9SNBYeSnpII/wZV5DXvBRXd6//ZST9aKw==,iv:JB5lYv9kk2FLSpficq3cUWXmjPlaGbdUJqeNTTwbqeM=,tag:nGVCFVE+qZX1BqxprVhIMA==,type:str]", "sops": { "age": [ { "recipient": "age1k02u4z06c0qwen95uwk4qphns3qqujtmz57sr3ea34f2rwh5kvjsfkjrfy", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxUlJjd251U0tPSDdYaEQw\nZ2FwemxtaVB6ZEJIdldIZ2RTVnVFc2t2Wld3Cm5xejExNmxsMnB2QzM1Sm5DN2Y5\nK0JVZlBma3dPMXdUWGRjbEp5aUJpajgKLS0tIG9uRm5ZTHR2L1MwdUNBTmRLYkJh\nSTVGRHZ2Ujg3R1pJck90RGNaWjdPOGMKxSR0jwCee41jU6j3gXVdLZ+qcx3uBikd\nL+uZP7JZ1ig+Ezl2gdOFyWsVBxCgZturm+G3K0DHbbf4HDOlFkaSpw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJVlBUeFp6QlU5SkJoWDBE\ndFgrV0FkY2tSZG5aOGwrdThic1F1RFBKaTFrCk5sVDcycnVnaXBLRHd3VjY0eXZ5\nS0kxWkgvOUlNd3BZUEppRnlaL20wcVUKLS0tIGR6UGx2VDE3dUgrdjBneFZaeVRI\nQUhDV3NlWERCdXBRczlpN25tMkVZYU0KMAp3MkHw4Zcs4VXaBn96r2izSdNUVri5\nIWXj9GnxCAYZ/t1l2tC0zhc3UI7sZKwPR2iCeER7vXmxf1gDTsWgTA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age165lra392e9ssuktvzf22yk63vjke8kfkmn6wrd0kvukwt8w7p5aqzx7exj", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwWEhaYStaYm05TWRjZXZz\nSEtXc09RU2hyYTN1TUJPOTJlNGwzZSsvUWkwCkdKUFIxSytnVk9RZEY5WmdOMHg0\nS2MwV3RPNlRWaXkwY0ZhYnFpcVZDbFkKLS0tIEhyTTZHRHJ2YjFrZklTS2FhNnVY\nNmVHQ1Y0WnVDL2RNZ3Jxb3V3RUNqakUKsxY4lwbdB1JRSd26D8zPL4MN1ivqxCY7\nKzhEKjkd7or67Ag6q4qFqJrDLBO+THesfFsPSFsVCWnXqnjARcYYfQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3OTJDcHVEMzVkZ1Z6SkdV\najk4MU1UR0JGQklPM2Yrd1ljeC9MdUxha2hRCnFKbkE4RS9kRzM2cS9nWUg1K0hN\ndUtyelRLRWFYenQ4bHk2MVJHRmZ0Wk0KLS0tIC9LZjh3T0lDWEpnd2J4ZGNRbGI0\nODhwZGN6Y0pwOStHR3F0dStuZytRN2sKjdKZIAzVCoprs4mkMputzJ8WT61zlEer\nbULodggN68y5WBHI90Rls9Yt/CwUK4DIEnxuFKP5XViW775yKTS/Ag==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age12ecq8rcc8s52e7nnzryjpafs73nzycp8jaa9z8s2gpnl5zn00a9q4u57nq", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUVUc2dGJ3Snk3a2h6cXdq\nSndiUi9RblptdVdCYmk1Umc3V21uckMvMUdNClVjdVdnZ0Zxa1J5NkIyUklveC8z\nZnJxZ2x3KzVyYnM3Nk0zRmRaZkZBQjQKLS0tIFlodVViZVp2c2grWHl1YjVUZURy\neVl1WThKK0JnekNsK3JRL3NsUTNrQ1kK45Xb/7nRZvNYt1ZkiupK9FF2Z0ydHKAV\nRJJpPno8WpJXNoMA0J+Gko0MI2gYtVVBqbpF3Bqbm5JEr09ZHfrPGg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5SFVDRXhmcnA5cG5HclU0\nR1NsSUNzaktIckFDMFE2dUxnTFNYbjZFajBnCk1CYW5XTzBobGNZK0RnSEorSm9v\ncGExSnNXdTM1Nm43bDVDNW1LNmJPZkUKLS0tICtXd2kxZ2NaS3pPTFd2aEJ5VVdQ\nbjR5WVV2dGxqNWI2Z1hwZDhOOWJiZWMKBZvh7tSqfzBvyBMomuYDdaNn+lxD6BbB\nkTJ+BsnsYLfFvwFLZ71EmGEVMVIDXWj7j3MLiaqPCxsTvM3Rpu0yrw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age13v28wrk4qqhxhux86rvrp9p9e675qcgg3lcxc0tjhgxyx99vc44smcgxyw", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlcDVBOEVMQ1JJdlRkRDJp\nWStGV0VRQ1Bjdy8zQnBEc21vb3FsaFRTbHd3CjJyak9oSmhFdi9Ua3ltbmVUR2Y5\ndjhJRnRpRGZJVlFJU1VDRWpucXlxVlUKLS0tIGJvR2hqdkltY0tvQk1FM3Fvb0VB\nQVJ5c2RVK2tGUHRwU3ZoL0Y0NEZnbFEKjKWnlqANUvMqHIfVQl+i5p/PVGlMhLg4\nmN94BvLf9A7bBYYCQ1vqa+8QlSR2f4/UFW6S+a57SAklXUHxjZOh+A==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1RHdyMW9obVhYK3V3VkFw\nRjJiRlRkcWUyUFk4WXhZQVJUNUl2VTUzbmxBCnY0T0lOckIzNzViT2dGNERDVFlT\nRUxsQ1FMSFd5N1BJVWJLcGR2ZW5HK28KLS0tIEJWZGk5TTd5dEZ4QXl3ckQ2bkJ4\nVzZSZmlYYURJaXBnK2RWRTZ6QUFYSTgKuAdqFTHUcag4FpQinwh5ERQ2evXPA//l\n2bYUaRTQjb8lnxc3USrBFogOC9kBE7cD8M6CyFVBFI4Dw1u2SFdSMw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age18ueht6ascr4y68s9n43f9jf40eve4ghsx848mp7hm86dmydqpgws0xxnqa", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRbGk0YlZzTko5d2pXUzF5\nSTB5QjRBQ2hYKys1RGZkNTloQlU5TDlBSGhvCnE4S3I5eFZ3SlBZYm9ibjhyc2RM\nTXluRWtXTytiRm8rV2lxUFBZMTcvOUEKLS0tIGlMbjhQYWdLbGRLaVUydGdpdGRq\nbXRvVkdHMzNLc21odmk4dnJtQ01GZFEKlEo4M6rugqQlS49++2NMVSdNRTd0ZNbd\nKo1CUQIqxKwZslZJYhVUqPtzBOmHzcM112FvUCVjt3ILuc19Gn+vtA==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-09-28T23:35:26Z", - "mac": "ENC[AES256_GCM,data:4/8mtu8bzA4Pwu2t3UCtFdJIHIUwBWLNSQg5N33xEPLbZ6Vkw6QqQ+cj24wnxnhWb63U4dxiR5IrYahRkpoEem1sBLfiDCv3gBKBTm8ORZFyOI3y9y7niiIM0dbu5nUedHOGIHATfLUv37tecZVDyUWIKRNRlejj89HtJ3v0AFw=,iv:6sPRy8kKZMBPdLdsh0zdXAd+iH/gUf6Iqc29Dz+L1gk=,tag:m6aggPYw//Zh3ZSWskiOWA==,type:str]", + "lastmodified": "2025-09-29T01:10:09Z", + "mac": "ENC[AES256_GCM,data:WQ33sXNppQrku6QMd7QfEjir0IZA0aTSHtHp8qiVwzTSx7gkkVmITrr/H46O+kSIJNtDAPVjrxtVI8j8DQk9SDprV6jHSr5AVaes/wZdKE2lWO8iYFHyvfHMKZl1eX9mKXwZLakZgXwS4ZDY6qxkygVo/kg+/QmMBAep9uYfpYk=,iv:wbmB9wrG6NXv81dKLUtIPpIHqtJ9zVSQo/BIFhB9ny4=,tag:2UhZrrrF9mptXofZIkgXBA==,type:str]", "unencrypted_suffix": "_unencrypted", "version": "3.10.2" } diff --git a/venus/modules/nixos-darwin/ethane.nix b/venus/modules/nixos-darwin/ethane.nix index c9ff003..e74a2dd 100644 --- a/venus/modules/nixos-darwin/ethane.nix +++ b/venus/modules/nixos-darwin/ethane.nix @@ -8,7 +8,7 @@ in { imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [ (modulesPath + "/virtualisation/digital-ocean-config.nix") - ./use-tailscale-dns-redirect.nix + #./use-tailscale-dns-redirect.nix ]; environment.systemPackages = [ @@ -116,7 +116,7 @@ in { #}; services.tailscale = { - enable = true; + enable = false; useRoutingFeatures = "both"; }; -- 2.51.2