From bb817ff7d4df72b0178d9d899a7300c80f509d16 Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 28 Jul 2024 08:45:09 +0900 Subject: [PATCH] Remove traces of win10-desktop and update ssh-luks with new desktop --- flake.lock | 294 +++++++++++----------- keys/ssh/keys.txt | 3 - nixos/common/modules/ssh-luks.nix | 5 +- nixos/common/services/syncthing.nix | 3 - nixos/hosts/nixos-desktop/syncthing.nix | 6 +- nixos/hosts/nixos-framework/syncthing.nix | 6 +- 6 files changed, 153 insertions(+), 164 deletions(-) diff --git a/flake.lock b/flake.lock index 370d85ce..029e93df 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721992626, + "narHash": "sha256-GFDSPWxOqEkNrbuSfyoQHGIaRhJNapn2Rv0EEmBGR9A=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "f95d1509370b7f40ef356ff69a332bd0356ab044", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -122,11 +155,11 @@ ] }, "locked": { - "lastModified": 1718474113, - "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", "owner": "ipetkov", "repo": "crane", - "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", "type": "github" }, "original": { @@ -159,18 +192,18 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1721902368, + "narHash": "sha256-noQ5SghRPe0jzQEbFQb3fYbV6LZEzr7lIRQoxlU7fyI=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "cf8c7405479cfde7ea4dc815e195391d2328df10", "type": "github" }, "original": { @@ -186,11 +219,11 @@ ] }, "locked": { - "lastModified": 1721417620, - "narHash": "sha256-6q9b1h8fI3hXg2DG6/vrKWCeG8c5Wj2Kvv22RCgedzg=", + "lastModified": 1722028105, + "narHash": "sha256-0ButnGQ1bCMIDblzC6NBSL71Wi6JmHGweI3scoV8CgM=", "owner": "nix-community", "repo": "disko", - "rev": "bec6e3cde912b8acb915fecdc509eda7c973fb42", + "rev": "5b01cea8b5753de9c2febd27203c530be14745ff", "type": "github" }, "original": { @@ -520,11 +553,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -616,24 +649,6 @@ "inputs": { "systems": "systems_5" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_6" - }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -695,11 +710,11 @@ ] }, "locked": { - "lastModified": 1721038330, - "narHash": "sha256-DyIGJ+DEnKeGd346YJCwjmp9hXwiYq8wqGtikgbDqSc=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "622291c026190caf13cb26f5136616b1ff0a07aa", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -870,11 +885,11 @@ ] }, "locked": { - "lastModified": 1720108799, - "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", + "lastModified": 1721330371, + "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", + "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", "type": "github" }, "original": { @@ -885,6 +900,7 @@ }, "hyprland": { "inputs": { + "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", "hyprutils": "hyprutils", @@ -894,11 +910,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721463092, - "narHash": "sha256-NT9adHxZtssgoYPsc1jW0NV2OAZBQoko0qdlLO7wkSg=", + "lastModified": 1722092643, + "narHash": "sha256-lHdWgl9Db10XupoOivqXbuV/05a612gSeAhvjAj/V2A=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f642fb97df5c69267a03452533de383ff8023570", + "rev": "daed75219fa7b4ec345337ec99f816e94bda338c", "type": "github" }, "original": { @@ -950,11 +966,11 @@ ] }, "locked": { - "lastModified": 1720381373, - "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "type": "github" }, "original": { @@ -975,11 +991,11 @@ ] }, "locked": { - "lastModified": 1721071737, - "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", + "rev": "962582a090bc233c4de9d9897f46794280288989", "type": "github" }, "original": { @@ -1000,11 +1016,11 @@ ] }, "locked": { - "lastModified": 1720215857, - "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", + "lastModified": 1721324119, + "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", + "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", "type": "github" }, "original": { @@ -1019,11 +1035,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1721226562, - "narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=", + "lastModified": 1721993749, + "narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "927eea31915468e06b94bedf678261dc7cf048c8", + "rev": "3bd059992912139d6a12e86ba418f933ec368ef2", "type": "github" }, "original": { @@ -1037,7 +1053,6 @@ "crane": "crane", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -1045,11 +1060,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1719818887, - "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=", + "lastModified": 1722082611, + "narHash": "sha256-V3l8hVgAjRr5aVWx7sTHTUFUz+wtlQvEzN7O4Y1qyc8=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429", + "rev": "2250c381fcb652273c0eba5e093dcdb31beeb3f8", "type": "github" }, "original": { @@ -1060,15 +1075,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1720958877, - "narHash": "sha256-ggCV3etL7W1X9kxhLPZP35+BBh1LgQybene+L/aeQaQ=", + "lastModified": 1721563874, + "narHash": "sha256-xsiynNj2qUbssiD5m+8ftWrGQflyOo5C4lPbqragiMc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "6e56a6fd1d993eb02c991d449819f01340888e02", + "rev": "e0ea775feda9f162a153ee1ca8d93367dd0ee028", "type": "github" }, "original": { @@ -1085,11 +1100,11 @@ ] }, "locked": { - "lastModified": 1720845312, - "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", + "lastModified": 1721719500, + "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", + "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", "type": "github" }, "original": { @@ -1106,11 +1121,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1720931326, - "narHash": "sha256-QHajV5BjfaMWbiOAJ/MGH+exXo+CjzUpkxxEtz0ZZ2k=", + "lastModified": 1721505437, + "narHash": "sha256-sZpyyf9EiRVyEA9vUVWNxu8yI9MU0nhlEuPBL3hvC60=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "c132534bc68eb48479a59a3116ee7ce0f16ce12b", + "rev": "2e522fb78d7613cecaf683875ab27b6c90e8a84f", "type": "github" }, "original": { @@ -1181,11 +1196,11 @@ }, "nixlib": { "locked": { - "lastModified": 1719708727, - "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", + "lastModified": 1721523216, + "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", + "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", "type": "github" }, "original": { @@ -1202,11 +1217,11 @@ ] }, "locked": { - "lastModified": 1720859326, - "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", + "lastModified": 1721869487, + "narHash": "sha256-zcusn81g+0gO+tSMhfs4W+wAP9As/MWNTBCbS+Ggp7A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", + "rev": "c12f9a969c8cdf14618774515c7c6c96aef753c7", "type": "github" }, "original": { @@ -1217,11 +1232,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721413321, - "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=", + "lastModified": 1722017959, + "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f", + "rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf", "type": "github" }, "original": { @@ -1248,11 +1263,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1720918433, - "narHash": "sha256-z3Lp++7k4l/3K4A+7v3cuHBNcm/vntGXgxElLH+INa4=", + "lastModified": 1721523216, + "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3b0b1763c0f0931deaa2980b7b146f8ae7a6a952", + "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", "type": "github" }, "original": { @@ -1263,27 +1278,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720915306, - "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", + "lastModified": 1721524707, + "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", + "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "type": "github" }, "original": { @@ -1295,11 +1310,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1721924956, + "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "5ad6a14c6bf098e98800b091668718c336effc95", "type": "github" }, "original": { @@ -1316,11 +1331,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1721432204, - "narHash": "sha256-P+EcNbJfOAfSiTbgv0x3IDx+f0yZYRDAVOQvSeLNuBI=", + "lastModified": 1721990326, + "narHash": "sha256-AL/quEgRTlQ8OyLsbxlA6Q7jY2yxPJPvGvZRbAkhImY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "79fefa5cf958abe84266753de014126afbd33935", + "rev": "55a7d37710a2e19e56e18be6f7a3be305383ff69", "type": "github" }, "original": { @@ -1331,11 +1346,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1721924956, + "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "5ad6a14c6bf098e98800b091668718c336effc95", "type": "github" }, "original": { @@ -1363,11 +1378,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1721226092, - "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "lastModified": 1721949857, + "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", "type": "github" }, "original": { @@ -1394,11 +1409,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1721924956, + "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "5ad6a14c6bf098e98800b091668718c336effc95", "type": "github" }, "original": { @@ -1410,11 +1425,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1721821769, + "narHash": "sha256-PhmkdTJs2SfqKzSyDB74rDKp1MH4mGk0pG/+WqrnGEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "d0907b75146a0ccc1ec0d6c3db287ec287588ef6", "type": "github" }, "original": { @@ -1426,11 +1441,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1720781449, - "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -1468,11 +1483,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1721045803, - "narHash": "sha256-dQGvOK+t45unF7DTp5bfO37hY0NkDUw6X3MH5CCTEAs=", + "lastModified": 1721923172, + "narHash": "sha256-IWjuOYLf2wKD0mS8FkiM1n2d1PrkTRJPP+UAIOFgWCQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "eef2f4c6b190d92e296e47e5fe10e7ced65fd959", + "rev": "551fc42d2aab63bcf3709aa20ebfd7269128642d", "type": "github" }, "original": { @@ -1500,11 +1515,11 @@ }, "nur": { "locked": { - "lastModified": 1721486692, - "narHash": "sha256-fmZoTQpuq01eCtQKnRKx/KDtHzaN4WHVCMUs3pVmkzE=", + "lastModified": 1722090855, + "narHash": "sha256-UOxCjK7sVFo84BwpVk8J6ea30/sFF4u34NDjsz/BB5E=", "owner": "nix-community", "repo": "NUR", - "rev": "d3bcf854a30dabaeaa31c888eb4e0e90410ab4b1", + "rev": "154aeb47f1685501779908a24c5c93f787b1320e", "type": "github" }, "original": { @@ -1601,11 +1616,11 @@ ] }, "locked": { - "lastModified": 1720992717, - "narHash": "sha256-8j1bZVfKT1vJ0e+U7NYRNBG+DdBj5C/tpwe5krxT4/4=", + "lastModified": 1721724566, + "narHash": "sha256-6H+OTxXkOrh3P+15bhkQJY7OaBrQVzx4Pz+pCn6rtIg=", "owner": "pjones", "repo": "plasma-manager", - "rev": "460b48dc3dcd05df568e27cbb90581d23baec8dc", + "rev": "b967e042896de0f64513d4596e3d1f3eae445d1c", "type": "github" }, "original": { @@ -1628,11 +1643,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1697,21 +1712,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1718504420, - "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", + "lastModified": 1722046723, + "narHash": "sha256-G7/gHz8ORRvHd1/RIURrdcswKRPe9K0FsIYR4v5jSWo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", + "rev": "56baac5e6b2743d4730e664ea64f6d8a2aad0fbb", "type": "github" }, "original": { @@ -1742,11 +1753,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1720926522, - "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", + "lastModified": 1721688883, + "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", + "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", "type": "github" }, "original": { @@ -1859,21 +1870,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1904,11 +1900,11 @@ ] }, "locked": { - "lastModified": 1720930114, - "narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=", + "lastModified": 1721769617, + "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b92afa1501ac73f1d745526adc4f89b527595f14", + "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", "type": "github" }, "original": { @@ -1984,11 +1980,11 @@ ] }, "locked": { - "lastModified": 1720194466, - "narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=", + "lastModified": 1721755049, + "narHash": "sha256-O17b38bQnmfxv7It3OnVYx7fp1seEdI7xxnw5vJFv30=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6", + "rev": "5555f467f68ce7cdf1060991c24263073b95e9da", "type": "github" }, "original": { diff --git a/keys/ssh/keys.txt b/keys/ssh/keys.txt index 2b4c2771..6a303a30 100644 --- a/keys/ssh/keys.txt +++ b/keys/ssh/keys.txt @@ -14,9 +14,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxM5Hqqw1jKzSpMGm3UQCISoWBsFzRGa+JnvlW0Eh9X ################# # Non-Nix Infra ################# -# (Tue Jan 09 21:06:13 PM JST 2024) albert@win10-desktop -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLHGSk3WffS/mrSeehcM4O9eBx5cp7IMNYc842xprr3 albert@win10-desktop - # (Fri Feb 02 08:17:00 AM JST 2024) Pixel 8 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBui9k0ByK4ldcfJCTaEyoQoltcZ3w07B/5WBxvz7Nzd Pixel 8 diff --git a/nixos/common/modules/ssh-luks.nix b/nixos/common/modules/ssh-luks.nix index b996b8a5..6b257a50 100644 --- a/nixos/common/modules/ssh-luks.nix +++ b/nixos/common/modules/ssh-luks.nix @@ -20,13 +20,12 @@ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINR8PCfKOTArLemqmnHom4vWJ6u8wrlpG6/gSqeYo/qD albert@piaware-rpi4'' # (Fri Dec 15 11:40:53 AM UTC 2023) albert@backups-rpi4 ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNkKoS32K487JaFza9TUFwrjwe9P7SNIHbVNxhzmRcI albert@backups-rpi4'' - # (Tue Jan 09 21:06:13 PM JST 2024) albert@win10-desktop - ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLHGSk3WffS/mrSeehcM4O9eBx5cp7IMNYc842xprr3 albert@win10-desktop'' # (Tue Feb 20 09:20:39 PM JST 2024) albert@nixos-framework ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMAJLaC+NJQYfrWlerUj8yMkAIofBGMOWQB4mU/ncDpz albert@nixos-framework'' # (Sat Apr 27 05:28:13 PM PDT 2024) albert@bakersfield-rpi4 ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJm3bTcalJgoZt7t5FqFrJl7ZYlC09ew2QWUVF6w1Iih albert@bakersfield-rpi4'' - + # (Sat Jul 27 12:34:43 PM JST 2024) albert@nixos-desktop + ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMrfwK60FYqUwvUwRuI3pwMnVX28aeuOvRPCMLNOi5IT albert@nixos-desktop'' ]; hostKeys = [ # Generate new keys with: diff --git a/nixos/common/services/syncthing.nix b/nixos/common/services/syncthing.nix index e213115f..c9cf1346 100644 --- a/nixos/common/services/syncthing.nix +++ b/nixos/common/services/syncthing.nix @@ -21,9 +21,6 @@ overrideFolders = true; settings = { devices = { - "win10-desktop" = { - id = "VDAEJGQ-RA7GAT5-KLA7SRL-X2CV2EG-RMRMD6Z-TFE36JA-2TBBQG2-ED346AL"; - }; "framework-server" = { # The docker container, not the host id = "ULRNA7N-Q7WTZR3-PDQW52W-IWT4UOG-ABF5RCT-W6XJXOW-WQTJIWR-GBFUJQR"; }; diff --git a/nixos/hosts/nixos-desktop/syncthing.nix b/nixos/hosts/nixos-desktop/syncthing.nix index 5afefc9a..ac9cae51 100644 --- a/nixos/hosts/nixos-desktop/syncthing.nix +++ b/nixos/hosts/nixos-desktop/syncthing.nix @@ -7,17 +7,17 @@ "kenshi-saves" = { id = "kenshi"; path = "/home/${username}/.steam/steam/steamapps/compatdata/233860/pfx/drive_c/users/steamuser/AppData/Local/kenshi/"; - devices = [ "framework-server" "win10-desktop" "nixos-desktop" "nixos-framework" ]; + devices = [ "framework-server" "nixos-desktop" "nixos-framework" ]; }; "world-of-warcraft" = { id = "ergcw-ay6yg"; path = "/home/${username}/Games/battlenet/drive_c/Program Files (x86)/World of Warcraft/"; - devices = [ "framework-server" "win10-desktop" "nixos-desktop" "nixos-framework" ]; + devices = [ "framework-server" "nixos-desktop" "nixos-framework" ]; }; "notes" = { id = "notes"; path = "/home/${username}/notes"; - devices = [ "framework-server" "win10-desktop" "nixos-desktop" "nixos-framework" ]; + devices = [ "framework-server" "nixos-desktop" "nixos-framework" ]; }; }; }; diff --git a/nixos/hosts/nixos-framework/syncthing.nix b/nixos/hosts/nixos-framework/syncthing.nix index 5afefc9a..ac9cae51 100644 --- a/nixos/hosts/nixos-framework/syncthing.nix +++ b/nixos/hosts/nixos-framework/syncthing.nix @@ -7,17 +7,17 @@ "kenshi-saves" = { id = "kenshi"; path = "/home/${username}/.steam/steam/steamapps/compatdata/233860/pfx/drive_c/users/steamuser/AppData/Local/kenshi/"; - devices = [ "framework-server" "win10-desktop" "nixos-desktop" "nixos-framework" ]; + devices = [ "framework-server" "nixos-desktop" "nixos-framework" ]; }; "world-of-warcraft" = { id = "ergcw-ay6yg"; path = "/home/${username}/Games/battlenet/drive_c/Program Files (x86)/World of Warcraft/"; - devices = [ "framework-server" "win10-desktop" "nixos-desktop" "nixos-framework" ]; + devices = [ "framework-server" "nixos-desktop" "nixos-framework" ]; }; "notes" = { id = "notes"; path = "/home/${username}/notes"; - devices = [ "framework-server" "win10-desktop" "nixos-desktop" "nixos-framework" ]; + devices = [ "framework-server" "nixos-desktop" "nixos-framework" ]; }; }; };