gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: koishi network

Browse source
This commit is contained in:
Kat Inskip 2022-09-18 11:07:05 -07:00
parent 6d1033271e
commit 0eb5e3bdd7
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
3 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

84
flake.lock generated
View file

@ -3,11 +3,11 @@
"arcexprs": { "arcexprs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1658896296, "lastModified": 1663355656,
"narHash": "sha256-TzRUsy8qj5BOjiYqsNFEXbkMG2PVE7eBP7xKkc9+b6k=", "narHash": "sha256-3unrNbVJR+s764pWKibdbKyf6g5IWng/sjpvLqiMlIU=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "4bbcdbce60a33065adc86570ebc22503bc85616a", "rev": "6fee134fe6ff18c3e59d24718c9f3193616a3f18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1657835815, "lastModified": 1663492236,
"narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=", "narHash": "sha256-KzgrcFVhv/Ca7m83SaijE0W+tLHzjoypHZm9gHGS+cY=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "54a24f042f93c79f5679f133faddedec61955cf2", "rev": "de4d41ee9fd12a60236c1f35cead7c511dac08eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
"doom-emacs": { "doom-emacs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1657393840, "lastModified": 1660901074,
"narHash": "sha256-ISaIbqCNKKz9DhrTVKvDS40CzZiqICb2eDepGUdwYQA=", "narHash": "sha256-3apl0eQlfBj3y0gDdoPp2M6PXYnhxs0QWOHp8B8A9sc=",
"owner": "doomemacs", "owner": "doomemacs",
"repo": "doomemacs", "repo": "doomemacs",
"rev": "33c5f3721a704c72e49efc5960be3785d1a80b81", "rev": "c44bc81a05f3758ceaa28921dd9c830b9c571e61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
"doom-snippets": { "doom-snippets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1655900328, "lastModified": 1662645711,
"narHash": "sha256-fEYwFxW2sdzNK14DrS92OCGy8KDPZKewrHljnE/RlzQ=", "narHash": "sha256-XKpPCtECGZQ5bFPPDUX3oAltXOJNwAI/OktxiLnADRE=",
"owner": "doomemacs", "owner": "doomemacs",
"repo": "snippets", "repo": "snippets",
"rev": "6b2bd5a77c536ed414794ecf71d37a60ebd4663e", "rev": "03a62fe7edf7e87fdbd925713fbd3bf292d14b00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +91,11 @@
"emacs-overlay": { "emacs-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1658430126, "lastModified": 1662654452,
"narHash": "sha256-W5zw1NI7c47qT/FCkNAVmahA5On5UUs1pabAL6Tb2iI=", "narHash": "sha256-mrr161UOnVNx2pzR9ePmhVlxapzQ57ZDSLb9BRgW0bo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "6c868dbad387da912e2a47f63a913c8a62555127", "rev": "70e241d5b189982dabc1fe55829475c5c483c89d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +234,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1656928814, "lastModified": 1659877975,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
"ws-butler": "ws-butler" "ws-butler": "ws-butler"
}, },
"locked": { "locked": {
"lastModified": 1658470797, "lastModified": 1662839665,
"narHash": "sha256-ovk7xcjGqoXgc7fV4m0tlKhiuAglON4TKmt//Bd0fLE=", "narHash": "sha256-TGSRXMmRTn4eza3q0XvqpuPoeCnkktPeD0TaM/V1pZ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"rev": "f7fd8620be427c6489f496645513d536e380c50c", "rev": "acbf1b70335d4fd6a6c05bc417d7f3ca44739437",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +373,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1658737577, "lastModified": 1663357389,
"narHash": "sha256-xosJ5nJT9HX+b6UWsSX6R+ap4AdZOCrl/r+IKFp2ASQ=", "narHash": "sha256-oYA2nVRSi6yhCBqS5Vz465Hw+3BQOVFEhfbfy//3vTs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a0e0d73b944157328d54c4ded1cf2f0146a86a5", "rev": "da6a05816e7fa5226c3f61e285ef8d9dfc868f3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,11 +405,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1658894697, "lastModified": 1663522399,
"narHash": "sha256-1PhtbuaLmYb6EvFgwlJvMWtsk+szKqHmx3XoIAzCvWs=", "narHash": "sha256-R8oLUcqp98/S4t+g7rkMLI8guwnk5QQpIN2X1Rf7k74=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "518cd7a2425ea83d59dff0ce75a4981f46c593dc", "rev": "795eb7eca811fac12c1b5c8661d7408a3ac9495f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
"org": { "org": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1658412564, "lastModified": 1662614940,
"narHash": "sha256-JHiUjc4OAfPtNTWikVYEIkJkba9qV4N3QbtcJpjk4cM=", "narHash": "sha256-9eAqhKXpTfZQH3bn19ien3HIzF100h8z97iHqs/QUgY=",
"owner": "emacs-straight", "owner": "emacs-straight",
"repo": "org-mode", "repo": "org-mode",
"rev": "99681ce38937ba993a0407cee4fd6a7f869211bf", "rev": "eb5ef0ae1424a725f933ef3929e5396a2ab727ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +454,11 @@
"org-contrib": { "org-contrib": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1652646857, "lastModified": 1661026052,
"narHash": "sha256-IWIShWyVnbwXqGLQaDNvJ0KoepxhIrXWTjPyGPEkQ14=", "narHash": "sha256-rE7aioQxeVjo+TVI4DIppKkmf/c7tRNzK6hQJAmUnVE=",
"owner": "emacsmirror", "owner": "emacsmirror",
"repo": "org-contrib", "repo": "org-contrib",
"rev": "c1e0980fd7a57ca2042fd78acfb1dfb5c3bc03fa", "rev": "0740bd3fe69c4b327420185d931dcf0a9900a80e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
"revealjs": { "revealjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1653993278, "lastModified": 1662369032,
"narHash": "sha256-X43lsjoLBWmttIKj9Jzut0UP0dZlsue3fYbJ3++ojbU=", "narHash": "sha256-1BZWA3W77YbNZUj+7vJbkTeWY8O4jjPg7t5PvlEVDYA=",
"owner": "hakimel", "owner": "hakimel",
"repo": "reveal.js", "repo": "reveal.js",
"rev": "039972c730690af7a83a5cb832056a7cc8b565d7", "rev": "8a97ad58b04045fe5a9c964aa31659bd27e665c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -566,11 +566,11 @@
"tf-nix": { "tf-nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1657549622, "lastModified": 1663367102,
"narHash": "sha256-gIoMfy8Roq4hh2BBL3Hd8Z+FsPtC4bGAcS/yttuahwg=", "narHash": "sha256-gcUzQDyXogvQ0TSYX2lrKQ5D/3k76w/lmL6tNrnNwXk=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "tf-nix", "repo": "tf-nix",
"rev": "c99cf454785d57cb430ae09c3327a0b619e2eed1", "rev": "133b92ea58c8c0cd7d02674013d67b54e169141f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -599,11 +599,11 @@
"ts-fold": { "ts-fold": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1658223568, "lastModified": 1662386895,
"narHash": "sha256-HxUAg+MUbH8nNhKtRzZDeN/a/sCQHSpDRCK2nvvHp8g=", "narHash": "sha256-pYW2hcHgkr9KYdRvX2EkpOt/OL8yl+mkZ21JbMKWc8Q=",
"owner": "jcs-elpa", "owner": "jcs-elpa",
"repo": "ts-fold", "repo": "ts-fold",
"rev": "ea554f10e79ed9846662b1639adc4b86783ecfc6", "rev": "017402713bd2f1fd7a691aa48afb4330f5397432",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
nixos/network.nix
View file

@ -159,7 +159,7 @@
create_domain = true; create_domain = true;
}; };
tailscale = mkMerge [ tailscale = mkMerge [
(mkIf (cfg.tf.enable) { (mkIf tf.state.enable {
ipv4 = meta.tailnet.${config.networking.hostName}.ipv4 or null; ipv4 = meta.tailnet.${config.networking.hostName}.ipv4 or null;
ipv6 = meta.tailnet.${config.networking.hostName}.ipv6 or null; ipv6 = meta.tailnet.${config.networking.hostName}.ipv6 or null;
}) })

2
nixos/systems/koishi.nix
View file

@ -14,7 +14,7 @@
type = "resource"; type = "resource";
connection = { connection = {
port = head config.services.openssh.ports; port = head config.services.openssh.ports;
host = config.network.addresses.private.nixos.ipv4.address; host = config.networks.gensokyo.ipv4;
}; };
}; };
}; };