From fbb8477c19728c1086cc6a821823f3f6d387f421 Mon Sep 17 00:00:00 2001 From: Hung Date: Wed, 7 Jun 2023 21:53:56 -0700 Subject: [PATCH] feat: more ssh targets; darwin spotlight home-manager is broken :( --- flake.lock | 6 +- native_configs/ssh/config | 37 +-- .../home-manager/base/darwin-spotlight.nix | 2 +- nix-conf/home-manager/flake.lock | 216 +++++++++++++----- nix-conf/home-manager/flake.nix | 2 +- scripts/hm-switch.sh | 2 +- 6 files changed, 182 insertions(+), 83 deletions(-) diff --git a/flake.lock b/flake.lock index a1e9aa9..f175de8 100644 --- a/flake.lock +++ b/flake.lock @@ -504,11 +504,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1685931219, - "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", + "lastModified": 1686020360, + "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", + "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7", "type": "github" }, "original": { diff --git a/native_configs/ssh/config b/native_configs/ssh/config index c5a9b14..61c7ae2 100644 --- a/native_configs/ssh/config +++ b/native_configs/ssh/config @@ -1,11 +1,3 @@ -Host * - IdentityFile ~/.ssh/id_ed25519 - IdentityFile ~/.ssh/id_rsa - -Host 10.111.103.* - StrictHostKeyChecking no - UserKnownHostsFile /dev/null - # felia mirror on windows Host felia-win HostName felia.coati-celsius.ts.net @@ -61,6 +53,7 @@ Host sr1 HostName 10.30.76.46 User htran Port 22 + StrictHostKeyChecking no HostKeyAlgorithms=+ssh-dss,ssh-rsa KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 @@ -68,6 +61,7 @@ Host bgp1 HostName 10.111.100.113 User htran Port 22 + StrictHostKeyChecking no HostKeyAlgorithms=+ssh-dss,ssh-rsa KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 @@ -75,13 +69,26 @@ Host bgp2 HostName 10.111.100.114 User htran Port 22 + StrictHostKeyChecking no HostKeyAlgorithms=+ssh-dss,ssh-rsa KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 - Host d1-30 HostName 10.111.103.60 User htran Port 22 + StrictHostKeyChecking no + UserKnownHostsFile /dev/null + IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/id_rsa + +Host d3l-3 + HostName 10.111.103.65 + User htran + Port 22 + StrictHostKeyChecking no + UserKnownHostsFile /dev/null + IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/id_rsa Host dev0 HostName 10.100.200.230 @@ -104,11 +111,6 @@ Host ztp-egi User root Port 22 -Host d3l-3 - HostName 10.111.103.65 - User htran - Port 22 - Host goat HostName 10.133.32.100 User "EGN NOC" @@ -130,4 +132,11 @@ Host gl-egi Port 22 IdentityFile ~/.ssh/id_ed25519 +Host 10.111.103.* + StrictHostKeyChecking no + UserKnownHostsFile /dev/null + +Host * + IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/id_rsa diff --git a/nix-conf/home-manager/base/darwin-spotlight.nix b/nix-conf/home-manager/base/darwin-spotlight.nix index c538e66..554e212 100644 --- a/nix-conf/home-manager/base/darwin-spotlight.nix +++ b/nix-conf/home-manager/base/darwin-spotlight.nix @@ -16,7 +16,7 @@ HM_APPS="$HOME/Applications/Home Manager Apps" # Reset current state if [ -e "$HM_APPS" ]; then - $DRY_RUN_CMD rm -r "$HM_APPS" + $DRY_RUN_CMD mv "$HM_APPS" "$HM_APPS.$(date +%Y%m%d%H%M%S)" fi $DRY_RUN_CMD mkdir -p "$HM_APPS" # .app dirs need to be actual directories for Finder to detect them as Apps. diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index e4d9579..f66ecce 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1678924180, - "narHash": "sha256-5bwage/7JRiPiDY4wY3+OBiT8abY5f83hss6pQBklz8=", + "lastModified": 1684292571, + "narHash": "sha256-OpCnswRyIATPNoiQR4O7jE7iAyI9dekG7HfYhgZI3aI=", "owner": "rustsec", "repo": "advisory-db", - "rev": "0888b44843e3c86db9fd56334c7f5261ea00dc19", + "rev": "0e97e6e71f0dd52b4b4e0ab3fa6e5e5dd72f852a", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1678152261, - "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", + "lastModified": 1684981077, + "narHash": "sha256-68X9cFm0RTZm8u0rXPbeBzOVUH5OoUGAfeHHVoxGd9o=", "owner": "ipetkov", "repo": "crane", - "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", + "rev": "35110cccf28823320f4fd697fcafcb5038683982", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1678152261, - "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", + "lastModified": 1684468982, + "narHash": "sha256-EoC1N5sFdmjuAP3UOkyQujSOT6EdcXTnRw8hPjJkEgc=", "owner": "ipetkov", "repo": "crane", - "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", + "rev": "99de890b6ef4b4aab031582125b6056b792a4a30", "type": "github" }, "original": { @@ -438,7 +438,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_2" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -456,7 +456,7 @@ }, "flake-utils_11": { "inputs": { - "systems": "systems_3" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -519,7 +519,7 @@ }, "flake-utils_15": { "inputs": { - "systems": "systems_4" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -566,12 +566,15 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -581,12 +584,15 @@ } }, "flake-utils_5": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -596,12 +602,15 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_4" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -611,12 +620,15 @@ } }, "flake-utils_7": { + "inputs": { + "systems": "systems_5" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -626,12 +638,15 @@ } }, "flake-utils_8": { + "inputs": { + "systems": "systems_6" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -803,11 +818,11 @@ ] }, "locked": { - "lastModified": 1685999310, - "narHash": "sha256-gaRMZhc7z4KeU/xS3IWv3kC+WhVcAXOLXXGKLe5zn1Y=", + "lastModified": 1686142265, + "narHash": "sha256-IP0xPa0VYqxCzpqZsg3iYGXarUF+4r2zpkhwdHy9WsM=", "owner": "nix-community", "repo": "home-manager", - "rev": "28614ed7a1e3ace824c122237bdc0e5e0b62c5c3", + "rev": "39c7d0a97a77d3f31953941767a0822c94dc01f5", "type": "github" }, "original": { @@ -938,11 +953,11 @@ "topiary": "topiary" }, "locked": { - "lastModified": 1685962675, - "narHash": "sha256-S4UEX+H/j3tmz+202ODtPuK7WWoPbSIbk0y5GXaHJPY=", + "lastModified": 1686147433, + "narHash": "sha256-KqDqUGNfXcOwh6fkHMbH4a2W6k/W7S7wC/mxstlORwo=", "owner": "tweag", "repo": "nickel", - "rev": "43bc8fee6a5f69455cd49be75b10d2d4219553e0", + "rev": "dc6804acd123257460eef60d615da2eb0a8aca78", "type": "github" }, "original": { @@ -1002,11 +1017,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1678109515, - "narHash": "sha256-C2X+qC80K2C1TOYZT8nabgo05Dw2HST/pSn6s+n6BO8=", + "lastModified": 1681154353, + "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", "owner": "numtide", "repo": "nix-filter", - "rev": "aa9ff6ce4a7f19af6415fb3721eaa513ea6c763c", + "rev": "f529f42792ade8e32c4be274af6b6d60857fbee7", "type": "github" }, "original": { @@ -1182,11 +1197,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1685931219, - "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", + "lastModified": 1686020360, + "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", + "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7", "type": "github" }, "original": { @@ -1230,11 +1245,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1678898370, - "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac718d02867a84b42522a0ece52d841188208f2c", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "type": "github" }, "original": { @@ -1245,11 +1260,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", "type": "github" }, "original": { @@ -1498,11 +1513,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1678976941, - "narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=", + "lastModified": 1685361114, + "narHash": "sha256-4RjrlSb+OO+e1nzTExKW58o3WRwVGpXwj97iCta8aj4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e", + "rev": "ca2fdbf3edda2a38140184da6381d49f8206eaf4", "type": "github" }, "original": { @@ -1584,11 +1599,11 @@ ] }, "locked": { - "lastModified": 1677812689, - "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", + "lastModified": 1683080331, + "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", + "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56", "type": "github" }, "original": { @@ -1609,11 +1624,11 @@ ] }, "locked": { - "lastModified": 1679106165, - "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=", + "lastModified": 1685759304, + "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565", + "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", "type": "github" }, "original": { @@ -1638,11 +1653,11 @@ ] }, "locked": { - "lastModified": 1677812689, - "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", + "lastModified": 1683080331, + "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", + "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56", "type": "github" }, "original": { @@ -1657,11 +1672,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1679106165, - "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=", + "lastModified": 1684808436, + "narHash": "sha256-WG5LgB1+Oguj4H4Bpqr5GoLSc382LyGlaToiOw5xhwA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565", + "rev": "a227d4571dd1f948138a40ea8b0d0c413eefb44b", "type": "github" }, "original": { @@ -1870,6 +1885,81 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "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" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "topiary": { "inputs": { "advisory-db": "advisory-db", @@ -1883,11 +1973,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1682503900, - "narHash": "sha256-3Kb9D8S0lkGcPAcpJJGInVyFN79K6gn6TN0ZHWFA19s=", + "lastModified": 1685522994, + "narHash": "sha256-OJQ16KpYT3jGyP0WSI+jZQMU55/cnbzdYZKVBfx9wNk=", "owner": "tweag", "repo": "topiary", - "rev": "773159aa4c819b46c6d51ca9275e7366087eb3a0", + "rev": "b2399161f60c1eb3404e487b4471ff76455d7a94", "type": "github" }, "original": { diff --git a/nix-conf/home-manager/flake.nix b/nix-conf/home-manager/flake.nix index 47cc1aa..84c87ed 100644 --- a/nix-conf/home-manager/flake.nix +++ b/nix-conf/home-manager/flake.nix @@ -180,7 +180,7 @@ modules = base.modules ++ [ ./home.nix ./base/productive_desktop.nix - ./base/darwin-spotlight.nix + # ./base/darwin-spotlight.nix { base.private_chromium.enable = false; } diff --git a/scripts/hm-switch.sh b/scripts/hm-switch.sh index 04013b1..baf0f55 100755 --- a/scripts/hm-switch.sh +++ b/scripts/hm-switch.sh @@ -37,7 +37,7 @@ nix flake update "${SCRIPT_DIR}/../nix-conf/home-manager" if ! command -v home-manager ; then nix-shell -p home-manager --run "home-manager switch --flake $HOME_MANAGER_DIR $@" else - home-manager switch -b backup --flake "$HOME_MANAGER_DIR" $@ + home-manager switch --flake "$HOME_MANAGER_DIR" $@ fi