From a8a330f0ed81e609b78ed7f1262384c428764ca1 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Mon, 16 Jun 2025 10:54:20 -0700 Subject: [PATCH 1/5] feat: switch to personal iamb fork --- flake.lock | 10 +++++----- flake.nix | 2 +- reference/users/youwen/hm.nix | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5c7e813..c87f404 100644 --- a/flake.lock +++ b/flake.lock @@ -566,15 +566,15 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749177992, - "narHash": "sha256-B72RIr6pbf9kW0JhcbsgUhLSw22BxxODoKIdPd2YWFY=", - "owner": "ulyssa", + "lastModified": 1750095849, + "narHash": "sha256-RHkuv+mFgHDRXk6Y5tfn5Xat7qDptOhS7lY38972cNc=", + "owner": "youwen5", "repo": "iamb", - "rev": "33d3407694c9dece0f3e59aa577eda98c9384ea1", + "rev": "d2b06d16ee3e042ddcf4f17f20849b67002c2760", "type": "github" }, "original": { - "owner": "ulyssa", + "owner": "youwen5", "repo": "iamb", "type": "github" } diff --git a/flake.nix b/flake.nix index 183e0e0..0643e58 100755 --- a/flake.nix +++ b/flake.nix @@ -110,7 +110,7 @@ }; iamb = { - url = "github:ulyssa/iamb"; + url = "github:youwen5/iamb"; inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/reference/users/youwen/hm.nix b/reference/users/youwen/hm.nix index cd7b631..58228ff 100644 --- a/reference/users/youwen/hm.nix +++ b/reference/users/youwen/hm.nix @@ -53,6 +53,8 @@ users = { "@ananthv:matrix.mit.edu".color = "magenta"; }; + username_display = "regex"; + username_display_regex = "discord_"; }; layout.style = "restore"; dirs.downloads = "/tmp"; From c10cd714110f67972cfbf8d7a1eb67564791aa0f Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Tue, 17 Jun 2025 23:00:06 -0700 Subject: [PATCH 2/5] feat: update ssh port for kaitotlex.systems --- reference/users/youwen/hm.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/reference/users/youwen/hm.nix b/reference/users/youwen/hm.nix index 58228ff..af751ff 100644 --- a/reference/users/youwen/hm.nix +++ b/reference/users/youwen/hm.nix @@ -79,6 +79,12 @@ identityFile = config.age.secrets.youwen_dev_ssh_priv_key.path; identitiesOnly = true; }; + "provenance.kaitotlex.systems" = { + host = "code.functor.systems"; + port = 26; + # identityFile = config.age.secrets.youwen_dev_ssh_priv_key.path; + # identitiesOnly = true; + }; "github" = { host = "github.com"; identityFile = config.age.secrets.github_ssh_priv_key.path; From 060b053525ff5fde75ef99aab87e45b315485808 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Tue, 17 Jun 2025 23:05:18 -0700 Subject: [PATCH 3/5] feat: add ssh secret for code.functor.systems auth --- reference/users/youwen/hm.nix | 10 +++++--- .../secrets/code_functor_systems_key.age | 24 +++++++++++++++++++ reference/users/youwen/secrets/default.nix | 4 ++++ reference/users/youwen/secrets/secrets.nix | 1 + 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 reference/users/youwen/secrets/code_functor_systems_key.age diff --git a/reference/users/youwen/hm.nix b/reference/users/youwen/hm.nix index af751ff..2967d57 100644 --- a/reference/users/youwen/hm.nix +++ b/reference/users/youwen/hm.nix @@ -80,11 +80,15 @@ identitiesOnly = true; }; "provenance.kaitotlex.systems" = { - host = "code.functor.systems"; + host = "provenance.kaitotlex.systems"; port = 26; - # identityFile = config.age.secrets.youwen_dev_ssh_priv_key.path; - # identitiesOnly = true; }; + "code.functor.systems" = { + host = "code.functor.systems"; + identityFile = config.age.secrets.code_functor_systems_key.path; + identitiesOnly = true; + }; + "github" = { host = "github.com"; identityFile = config.age.secrets.github_ssh_priv_key.path; diff --git a/reference/users/youwen/secrets/code_functor_systems_key.age b/reference/users/youwen/secrets/code_functor_systems_key.age new file mode 100644 index 0000000..67bcd7a --- /dev/null +++ b/reference/users/youwen/secrets/code_functor_systems_key.age @@ -0,0 +1,24 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSB4eitP +U0ZJSHYxSXFveDJnRGpXWHJEWjJzWkZsZDB4NEd0eDlWaWVNMEZzCk9FeXZGMGJm +SHoyU0ZsRytpMVpKQnNEVWs4akJMZ3dqa1NEU0VSNVlUMDAKLT4gc3NoLWVkMjU1 +MTkgQUk3S1Z3IG5OM0c0TGhoaTIwZVlWcmdqdmpSM0h1and2N3lmN2pKTVZBMnFl +OEdOU28KOERJRkVDZ3VLbTlwRXVoR2RLbEIxR3JudHhBZW9Na0lFM0VlRXBTRDg1 +NAotPiBzc2gtZWQyNTUxOSBUKzhkOVEgdTFoRTYrY3Iwb1FVSnh2bCt5cTcrMDRl +R244azhCM1RjUGZycXZuWHczcwpGdkN0RGx5YmtVeDdhcHlMVkZoRXlDWjlQTzZ2 +Zjd1V0hCOEVKOXI5ejlJCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSBPWXA0YTFqT3Na +c3NXRjh3MnhJUVUrUkhiNFBXNjFGaTM0ZmdNNzBkdldjCjdVdDEwNjNKOGZUQ3oy +b1Z2ejNFVWIrczZkckF2d1ZpaVZCL1lFekR0cncKLT4geGx0YUQtZ3JlYXNlIFsg +aShcUiVnXzQgaFp6IFVUCkd1dmxGc2hmcmV6dGNIOWNIeUUKLS0tIHFtMDArMW9u +THBMcU0xenJHd0dvL0lJaml1RkE3MnZCRWllQnFxZHRwelUKkciKmnSAFI4kFnBx +aIVvUwTrt5cpmlz3gMs0CcmxRjbnGpJUHtd2GAsJM72vh6lOgZVHWrz8XlWZkkN0 ++OzmOxitg2RVHro4GT8g6XUofkiEZVuj3qT+AUNOnsaghlgFy3Jo/qOhmYI94Uw3 +rDy5IlxIovpr3Nr59Kve8AJrt8/dMsbJiiDjNpi+t8PM8A8VIvNrWxEPOcDGNuOS +y1Z0q2DxIpqGaX0rEm1nUhwgcTFOf3XYFvLor8x/Tux5XKAh0ibEQmNfQ4aVKR/b +GjJPTtrRSQq77c/weEYmV8Gu4cwMCXZP7v3BLjC707Ajn0+W5G1gALJva26XndiY +OsR2idpMh8LIKW1zjK09wBz5kcueyLE6AQWsJWzTClVcm+6TKEgHK2/fY+TIe0DS +4GUp5xVN/BgykEU1kjWEwoP/shU+waI60W+AKECjDMLKDvPbupM7Xj1vUgXlx7VH +z4zvjs0Cd3IE9JouwUOdnVWGM7xM5YAPLA1SyRwSXg4jj/EQYkOllmVXjanI+Y9X ++pReWzgFdSlgeVBf8TxpFoAPfEWWw2tdBq4sQIiL7n7vc1Cjtk491nnRUCQGyePJ +r2TI6jGAVQ== +-----END AGE ENCRYPTED FILE----- diff --git a/reference/users/youwen/secrets/default.nix b/reference/users/youwen/secrets/default.nix index 7a3c311..ab220fc 100644 --- a/reference/users/youwen/secrets/default.nix +++ b/reference/users/youwen/secrets/default.nix @@ -39,5 +39,9 @@ mode = "600"; path = "${config.home.homeDirectory}/.wakatime.cfg"; }; + code_functor_systems_key = { + file = ./code_functor_systems_key.age; + mode = "600"; + }; }; } diff --git a/reference/users/youwen/secrets/secrets.nix b/reference/users/youwen/secrets/secrets.nix index 98c583c..e2eebe3 100644 --- a/reference/users/youwen/secrets/secrets.nix +++ b/reference/users/youwen/secrets/secrets.nix @@ -12,4 +12,5 @@ in "youwen_dev_ssh_priv_key.age".publicKeys = users; "gallium_server_ssh.age".publicKeys = users; "wakatime_cfg.age".publicKeys = users; + "code_functor_systems_key.age".publicKeys = users; } From 60c5946add946e80030a138dc2e3aa02d045bec9 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 19 Jun 2025 11:14:41 -0700 Subject: [PATCH 4/5] chore: dont specify url for functor.systems matrix --- reference/users/youwen/hm.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/reference/users/youwen/hm.nix b/reference/users/youwen/hm.nix index 2967d57..b214d62 100644 --- a/reference/users/youwen/hm.nix +++ b/reference/users/youwen/hm.nix @@ -40,10 +40,7 @@ settings = { default_profile = "functor.systems"; profiles = { - "functor.systems" = { - user_id = "@youwen:functor.systems"; - url = "https://matrix.functor.systems"; - }; + "functor.systems".user_id = "@youwen:functor.systems"; "matrix.org".user_id = "@youwen:matrix.org"; "nixos.dev".user_id = "@youwen5:nixos.dev"; }; From 8a0286a3fee6f3cfe5e62e28262f3883756052ea Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 19 Jun 2025 11:16:03 -0700 Subject: [PATCH 5/5] Revert "chore: dont specify url for functor.systems matrix" This reverts commit cdfb05df59c2fb927e37d7fe277e4aee2d72adad. --- reference/users/youwen/hm.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/reference/users/youwen/hm.nix b/reference/users/youwen/hm.nix index b214d62..2967d57 100644 --- a/reference/users/youwen/hm.nix +++ b/reference/users/youwen/hm.nix @@ -40,7 +40,10 @@ settings = { default_profile = "functor.systems"; profiles = { - "functor.systems".user_id = "@youwen:functor.systems"; + "functor.systems" = { + user_id = "@youwen:functor.systems"; + url = "https://matrix.functor.systems"; + }; "matrix.org".user_id = "@youwen:matrix.org"; "nixos.dev".user_id = "@youwen5:nixos.dev"; };