diff --git a/hosts/known-hosts.toml b/hosts/known-hosts.toml index d2d03a7..9798204 100644 --- a/hosts/known-hosts.toml +++ b/hosts/known-hosts.toml @@ -36,14 +36,14 @@ supportedFeatures = ["kvm","big-parallel","nixos-test"] ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeOB/57N1fQPVorIUlkkJZaQduBo+4+km2Qbj4ebd/k" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["eple.pbsds.net"] +["eple.pbsds.net"] # r9 290x maxJobs = 3 # 12 threads 32GB speedFactor = 5 supportedFeatures = ["kvm","big-parallel","nixos-test"] ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH03MEINNnjBvtmvN2QsCDCLkvF9ow5FQJp9uiyQ1Iwi" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["garp.pbsds.net"] +["garp.pbsds.net"] # gtx 1080 maxJobs = 2 # 8 threads 32GB speedFactor = 4 supportedFeatures = ["kvm","big-parallel","nixos-test"] @@ -56,7 +56,7 @@ speedFactor = 2 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ3QhTGS03Sqm6OeCEz5AIGqJnBttKaBqMgNXp3Md7t4" ssh.userPublicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7fYndgIXJM+tLSfkbprWc8ClOI58wlaZCg6I+wMYINeOwxLU24BmIyQAhNeqhHYBdXiyIAl5KN3+YajN1nx6zq2XPXLut31Xtf+0yMdRMX4rXgqOnsBeG4eTfNsPx+v7VNANth8dIADpk59Y9ioWB6JI6NF0wfkqrCSTpt2q9gpTA35MBe41hlaxqxYGq+PlfZyJbN4TJCORZROkjw1P6K+EoYUHTHmduMZSAnpzx5bTHL2r1VK1jLRL4q2O1LP9G7eVYUsZKxKznJqtAeoOGBL4OX2JeIXT51/pXTW0NNyVPELD6aUUZjK8aVK2JDXupXegYO8cHqwLaz7rZj3G8evGamSlGvAYR4Gwvvp4Du8ZRZVM3Gt1allhPMTLnm/gy9Lta35D8SHH0IUKWD3buo5HZliZgSMAvoSrT03vpuGILLoWEkTjpPT0qKIlBd/qlACBzKC9Wwmda5WWgMsfe0zP4zNLVdves5nkMrbY91TYSFM0FuDCaRsK5Mrhx7i0= root@noximilien" -["sopp.pbsds.net"] +["sopp.pbsds.net"] # gtx 1080 #maxJobs = 2 # 8 threads 32GB speedFactor = 3 supportedFeatures = ["kvm","nixos-test"] @@ -64,7 +64,7 @@ ssh.listenPort = 26 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDYB9H1pHB1vTBiGhO/GCQjn70BtVdQuJyXx38zN2CDj" ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6eTQkxO/1XflHpGf3478+Z7HFYYaf1d4M6mvSK2nAU root@sopp" -["nord.pbsds.net"] +["nord.pbsds.net"] # rx 580 #maxJobs = 1 # 4 threads 32GB speedFactor = 2 supportedFeatures = ["kvm","nixos-test"] @@ -72,7 +72,7 @@ ssh.listenPort = 24 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBSdIUtUfAxnVbPDmDDFdP2S3Wd3+CC8IfZAANJ76oh" ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINnS1TmV9q7n+s7+RouuB6vQllnhqNCE1RqPmTMJ2/29 root@nord" -["rocm.pbsds.net"] +["rocm.pbsds.net"] # gtx 3070 laptop edition #maxJobs = 1 # 16 threads 32GB speedFactor = 5 ssh.listenUser = "pbsds" @@ -83,7 +83,7 @@ ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4v1+FbiEa6Mohpf3/Una5 ["isvegg.pvv.ntnu.no"] # maxJobs = 1 # 4 threads 16GB -speedFactor = 2 +speedFactor = 1 ssh.listenUser = "pederbs" ssh.listenPublicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU=" @@ -99,6 +99,12 @@ speedFactor = 1 ssh.listenUser = "pederbs" ssh.listenPublicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKw92q3eB5HZbKJN3p+80MtirqcXPu01USE9LnoGYJuDvko1udjIy4UR0wAwELqgs+r7mJyuQPeXmOZKwjHP6tM=" +["orchid.pvv.ntnu.no"] # GTX 1060 +maxJobs = 2 # 12 threads 16GB +speedFactor = 2 +ssh.listenUser = "pederbs" +ssh.listenPublicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJXBrUdX0iFCkADXvqrcljEu0gxFOX+uOy6kqNx15WcNI+vt/YI7e/K4COf6LxuLsplLrrymcPdqsteAeWnPszs=" + ["hildring.pvv.ntnu.no"] ssh.listenUser = "pederbs" ssh.listenPublicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU=" @@ -136,133 +142,133 @@ ssh.listenPublicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIb #ssh.egressPrivateKey = "/run/secrets/nix-community-builders-ssh-key"; -["clab01.idi.ntnu.no"] +["clab01.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJfJV5Ov3D0qErVnbQZ3oxhA3i0zuAmjmVUf3JV08aSg" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab02.idi.ntnu.no"] +["clab02.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHNhQPotOGWZdFeW4B3eDYGcaF/2xB56hNL+x3QEURa6" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab03.idi.ntnu.no"] +["clab03.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH5srnYPuULchLvlCOlWOwrhQEBznQn61kj0Oawnp44Y" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab04.idi.ntnu.no"] +["clab04.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICgMxLYYiYb/6IAH6nyc9eGXASgDPTE2JcRZ9ODjhQt5" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab05.idi.ntnu.no"] +["clab05.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHw4h4dH689bLYWjrhhsvfljyWfUEClPa1Kb0cYxLRaD" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab06.idi.ntnu.no"] +["clab06.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDVZ394P3124lSxkzVodFqbindIvCB3kcn4YcgbaPrAs" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab07.idi.ntnu.no"] +["clab07.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILKQfcOmWC73bmE2mlWEcXFHiDUhsYWA7Xy9Dtq8kKmn" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab08.idi.ntnu.no"] +["clab08.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKlyZq3uTBCgkvPgs6nWRzsdhHmXHph14dmYWgt1vuBx" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab09.idi.ntnu.no"] +["clab09.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAj4eXT/k7iiUYx+CXq5ShLWm1N6SNO23EIs4xYEaQaW" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab10.idi.ntnu.no"] +["clab10.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG5xEUkiwXWaUCA+QfMDq2vHfXKzcpXlrHpJMNQ8EU+K" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab11.idi.ntnu.no"] +["clab11.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFlKZhdQBrjafzzwdRR3arem3TXnnPucQskd7RWW9L5V" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab12.idi.ntnu.no"] +["clab12.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDEr2zGzev8JffE67Hkb3Qli7K0kzVdu8VXxJW47PK7m" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab13.idi.ntnu.no"] +["clab13.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZgIhgpMCdegJaW6Huad7Dj4YfyR8Zhi1UmDsgcJYK2" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab14.idi.ntnu.no"] +["clab14.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3pAYx5rtbaUCf4xsiy+7/qKqnGMnSa9KCp42j+XmEh" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab15.idi.ntnu.no"] +["clab15.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7XwwhLJGwK+a7zShr2Ok9f2GlvPkP+FxKdbGYsNHtd" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab16.idi.ntnu.no"] +["clab16.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJKAaMXBAYsDd2QQOAQhXAAJCejbylQNLI9KsN3/EsY+" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab20.idi.ntnu.no"] +["clab20.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEGBbcKU5uDTgaQoREjaNuzQkCKNm5wlnhln6ZNiL3o2" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab22.idi.ntnu.no"] +["clab22.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMHlaYq184VDBoEOtaIIu2jnuBihhWiGPlyku0SMKORG" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab23.idi.ntnu.no"] +["clab23.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsIRgqoFF900olTCy6DSrFMpZyRmtK6aVP2oYQhNi8g" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab24.idi.ntnu.no"] +["clab24.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqh/Sp13OcUnZ8gVgiylcLsqAgIw+twQG92GyZK3FBZ" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab25.idi.ntnu.no"] +["clab25.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdL5coXj0geu9O1cMLdYuUE0TWlIkKLNj71/XF0e8eg" ssh.proxyJump = "isvegg.pvv.ntnu.no" -["clab26.idi.ntnu.no"] +["clab26.idi.ntnu.no"] # gtx 4090 #maxJobs = 1 # 24 threads 64GB ssh.listenUser = "pederbs" ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINqqxg0hVT/gPBM1xqrR9QtMRHVBZDYWZ3pzbJv9MHUG" diff --git a/justfile b/justfile index ee72394..57a600a 100644 --- a/justfile +++ b/justfile @@ -3,10 +3,10 @@ export GUM_FILTER_HEIGHT := "15" @_default: just "$(gum filter --placeholder "Pick a recipie..." $(just --summary --unsorted))" -eval hostname=`just _a-host`: +eval hostname=`just _a_host`: nix eval .#nixosConfigurations.{{hostname}}.config.system.build.toplevel.outPath -report hostname=`just _a-host`: +report hostname=`just _a_host`: nix eval .#nixosReports.{{hostname}} --json | yq . --yaml-output | bat --language yaml --style plain --paging never reports: @@ -32,12 +32,12 @@ switch: boot: sudo nixos-rebuild boot --accept-flake-config --show-trace --flake . -push hostname=`just _a-host` cmd=`gum choose test switch boot --header "Select mode..."`: +push hostname=`just _a_host` cmd=`gum choose test switch boot --header "Select mode..."`: nixos-rebuild build --flake .#{{hostname}} @echo pushing... NIX_NO_NOM=1 NIX_SSHOPTS="-tt" nixos-rebuild {{cmd}} --flake .#{{hostname}} --use-remote-sudo --target-host $(nix eval .#nixosReports.{{hostname}}.fqdn --json | jq . -r) --use-substitutes -@_a-host: +@_a_host: nix eval .#nixosConfigurations --apply builtins.attrNames --json 2>/dev/null | jq '.[]' -r | gum filter --placeholder "Pick a host..." @remote-current: @@ -59,6 +59,7 @@ push hostname=`just _a-host` cmd=`gum choose test switch boot --header "Select m remote label=`just _a-remote-label` cmd=`printf "just %s\n" $(just --summary --unsorted) | gum filter --placeholder "Pick a recipie..."`: remote --label={{label}} {{cmd}} +# TODO: packaged as nix-web @gorgon: # https://codeberg.org/gorgon/gorgon/src/branch/main/nix-web # https://discourse.nixos.org/t/a-web-ui-for-the-nix-store-early-beta/35762 diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index ec0b107..66e3434 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -65,6 +65,7 @@ vgmstream ffmpeg-full + (pkgs.termsvg or pkgs.unstable.termsvg) lolcat toilet @@ -87,7 +88,7 @@ unstable.nix-init unstable.deadnix unstable.statix - (pkgs.nixfmt-rfc-style or unstable.nixfmt-rfc-style or null) + (unstable.nixfmt-rfc-style or pkgs.nixfmt-rfc-style or null) nurl manix #comma # collides with nix-index-database diff --git a/users/pbsds/home/profiles/ssh.nix b/users/pbsds/home/profiles/ssh.nix index 34a4964..e8bf3cd 100644 --- a/users/pbsds/home/profiles/ssh.nix +++ b/users/pbsds/home/profiles/ssh.nix @@ -88,6 +88,8 @@ # pvv "balduzius.pvv.ntnu.no".user = "root"; + "bekkalokk.pvv.ntnu.no" = {}; # pvv-web pvv-wiki pvv-webmail + "bicep.pvv.ntnu.no" = {}; # pvv-databases pvv-synapse "brzeczyszczykiewicz.pvv.ntnu.no" = {}; "demiurgen.pvv.ntnu.no" = {}; "drolsum.pvv.ntnu.no" = {}; @@ -95,12 +97,14 @@ "eirin.pvv.ntnu.no" = {}; "georg.pvv.ntnu.no" = {}; "git.pvv.ntnu.no" = {}; + "orchid.pvv.ntnu.no" = {}; "hildring.pvv.ntnu.no" = {}; "innovation.pvv.ntnu.no".user = "root"; "isvegg.pvv.ntnu.no" = {}; "lommel.pvv.ntnu.no" = {}; "microbel.pvv.ntnu.no" = {}; "principal.pvv.ntnu.no".user = "root"; + "shark.pvv.ntnu.no" = {}; "skrott.pvv.ntnu.no".user = "root"; "sleipner.pvv.ntnu.no".user = "root"; "tallulah.pvv.ntnu.no" = {};