From 0810406154c364f93d88f965ac57e9e9ccac1996 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 29 Jan 2025 11:07:28 +0100 Subject: [PATCH] rip brumle --- .sops.yaml | 12 -------- flake.nix | 15 +++++---- hosts/known-hosts.toml | 8 ----- hosts/nixos/brumlebasse/configuration.nix | 37 ----------------------- hosts/nixos/noximilien/configuration.nix | 2 +- users/pbsds/default.nix | 5 --- users/pbsds/home/profiles/ssh.nix | 2 -- 7 files changed, 8 insertions(+), 73 deletions(-) delete mode 100644 hosts/nixos/brumlebasse/configuration.nix diff --git a/.sops.yaml b/.sops.yaml index 9a0277c..02a2239 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -13,7 +13,6 @@ keys: # https://github.com/getsops/sops/pull/1123 - &host_garp age14qunhxz08gmw5r8ky0ez9rjf9dj3ue9hrzz580gwwj4cms46vd7ss4rutf - &host_eple age1fha09v5edg88ys45a0u3tpjqfyl29fsy9xaz8xxfy60zjhmas5psfdxynp - &host_nord age19xrvt0gjl4fcfjyy62mrl9uuzrq9e0wgemtkykr07ewz7nqn9cwshngel5 - - &host_brumle age1czlqpfdvey2hzgr79skxvtg4stnfawq045l5sl59j0cd9hfuqvlq83v647 # brumlebasse - &host_bjarte age13dmsned3exqn2wwwxa465vwmdtfuktk49gpshwtu0ujp94syzq5suj0a9w # https://github.com/getsops/sops#key-groups @@ -31,7 +30,6 @@ creation_rules: - *host_garp - *host_eple - *host_nord - - *host_brumle - *host_bjarte # dns - path_regex: secrets/dns.yaml$ @@ -44,7 +42,6 @@ creation_rules: - *host_bolle - *host_garp - *host_eple - - *host_brumle - path_regex: secrets/tailscale-inner.yaml$ key_groups: - age: @@ -62,7 +59,6 @@ creation_rules: - *user_pbsds_sopp - *user_pbsds_nord - *user_pbsds_bjarte - - *host_brumle - *host_bolle - *host_garp # home-manager @@ -128,11 +124,3 @@ creation_rules: - *user_pbsds_nord - *user_pbsds_bjarte - *host_bjarte - # brumlebasse only - - path_regex: hosts/nixos/brumlebasse/secrets.yaml - key_groups: - - age: - - *user_pbsds_sopp - - *user_pbsds_nord - - *user_pbsds_bjarte - - *host_brumle diff --git a/flake.nix b/flake.nix index 65b9443..19bc64f 100644 --- a/flake.nix +++ b/flake.nix @@ -291,7 +291,6 @@ #hostname "domain" "system" inputs "state" [ modules ... ] asgaut = mk "pbsds.net" "riscv64-linux" inputs-2405 "24.05" [ hw.starfive-visionfive-2 ]; noximilien = mk "pbsds.net" "x86_64-linux" inputs-2411 "24.11" [ au ts1 tse intel ]; - brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au amd nspawn ]; nord = mk "pbsds.net" "x86_64-linux" inputs-2411 "24.05" [ au ts1 intel-novga hw.common-gpu-intel-sandy-bridge rocm hidpi ]; sopp = mk "pbsds.net" "x86_64-linux" inputs-edge "24.05" [ au ts1 nixld intel cuda p1005 ]; bjarte = mk "pbsds.net" "x86_64-linux" inputs-edge "24.05" [ ts1 nixld intel hw.lenovo-thinkpad-x1-7th-gen ]; @@ -356,13 +355,13 @@ sdImage.compressImage = false; } ])).asgaut.config.system.build.sdImage; - brumlebasse-nspawn-setup = mk-nspawn-setup "brumlebasse"; - brumlebasse-openstack = nixos-generators-2405.nixosGenerate { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ (mkHosts (mkModule [])).brumlebasse ]; - format = "openstack"; - }; + #brumlebasse-nspawn-setup = mk-nspawn-setup "brumlebasse"; + #brumlebasse-openstack = nixos-generators-2405.nixosGenerate { + # system = "x86_64-linux"; + # specialArgs = { inherit inputs; }; + # modules = [ (mkHosts (mkModule [])).brumlebasse ]; + # format = "openstack"; + #}; }); homeModules.jump = ./users/pbsds/modules/jump.nix; diff --git a/hosts/known-hosts.toml b/hosts/known-hosts.toml index 9401b82..7231ad2 100644 --- a/hosts/known-hosts.toml +++ b/hosts/known-hosts.toml @@ -118,14 +118,6 @@ aliases = [ "bjarte.tail9aac63.ts.net" ] ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4v1+FbiEa6Mohpf3/Una5ahKeKSG9yZ9iU5TC7ddL5 root@bjarte" # wakeonlan f8:75:a4:58:f1:35 -["brumlebasse.pbsds.net"] -# buildMachine.maxJobs = 1 # 2 threads 2GB -buildMachine.speedFactor = 5 # EPYC 7742 -ssh.listenUser = "root" -ssh.listenPort = 2222 -ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILD7+tE6rm742fz+nqa3+zlglMuzCzOQlc0OSJssvgVL" -ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJVohqGMKp/UEZtb71RSBBXOEGX4o3lN5GYBlP7HEKbs root@brumlebasse" - ["isvegg.pvv.ntnu.no"] # buildMachine.maxJobs = 1 # 4 threads 16GB diff --git a/hosts/nixos/brumlebasse/configuration.nix b/hosts/nixos/brumlebasse/configuration.nix deleted file mode 100644 index 825ce8a..0000000 --- a/hosts/nixos/brumlebasse/configuration.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - # Bootloader - #N/A - - ## gated on formatAttr which is set by nixos-generators - #boot = lib.mkIf ((config.formatAttr or null) == null) { - # loader.systemd-boot.enable = true; - # loader.efi.canTouchEfiVariables = true; - # loader.efi.efiSysMountPoint = "/boot/efi"; - #}; - - imports = [ - #./hardware-configuration.nix - ../../../profiles/sshd.nix - - ../../../users/pbsds - - ../../../profiles/shell.nix - - #../../../profiles/domeneshop-dyndns.nix - ../../../profiles/known-hosts.nix - ]; - #services.domeneshop-updater.targets = [ config.networking.fqdn ]; - - nix.settings.max-jobs = 0; # remotes only lol, nspawn container has broken sandbox - - services.openssh.enable = true; - services.openssh.ports = lib.mkForce [ 2222 ]; - networking.firewall.allowedTCPPorts = [ 2222 ]; - - # Networking - networking.networkmanager.enable = true; - - # TODO: remove? Move? - programs.dconf.enable = true; -} diff --git a/hosts/nixos/noximilien/configuration.nix b/hosts/nixos/noximilien/configuration.nix index a6afcde..9894a57 100644 --- a/hosts/nixos/noximilien/configuration.nix +++ b/hosts/nixos/noximilien/configuration.nix @@ -70,7 +70,7 @@ #../../../profiles/http/services/openspeedtest.nix /**/ - # TODO: move to brumle + # TODO: move ../../../profiles/http/docs ../../../profiles/http/docs/pdoc.nix ../../../profiles/http/docs/python-docs.nix diff --git a/users/pbsds/default.nix b/users/pbsds/default.nix index bae5311..df80313 100644 --- a/users/pbsds/default.nix +++ b/users/pbsds/default.nix @@ -67,18 +67,13 @@ #"ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAClYXCu7CyStjJ0AqZadUWfuA0h/3kC5FUJk4nTsR0nLXSNp26ETKYY9dID1JQCNgPDDZU3EKCNCpK+nZ/Q09L+agH5XtP6MRIDs0+aXZXy0rcLjS2fgx4ZgIiDGfBlaMCIrM/mdRzVmrYbeMotmkdsLSQ/lFBvX1IuzvUSnyYmRPCXxA== pederbs@hildring" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnVaayewel9GWGUYpTdLqfBnYnaBM10Vfq9fxeb9odwjf6pWe78il/5BCgW5EOadR/PeRv/ZYYnIT1uKEJOZkhjY2E6P2/B/JgzwPTwsrrjQsDHd5VjZty097dmf6vj0LXeJHmP9yogjPjGaSxktqyZi2CTFskRfZBPeCsoRMG+Z5bCMOHpXolvGCVWBNRcT3ITVYAAFL7HNPhcN3f5JkQgu0N+ySlMclNNSbHXXv1OIcLMKto6ZDx4DHp7NmU9uSbv8ERAfmoLCgdz1zOg0eVw9Kxs+XpUy3YFDdmPrny/Vq2LCDHljUWtjJI1uBoPF/ngavV+AuX5FHU9OSKNu7H pbsds@knut.pbsds.net" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+qv5MogWwOgctQfQeHxUHF2ij6UA8BR4DLXtZClnw6A1CtOjAtZeAW62C8q9OKaIKDO0hqd2vLBkgEno4smqBDJ2ThwKuXrhiHqJzCkXZqIKKx79mpTo7aRpFgkJ7328Ee+tbqa65coL98WRhLnDg69NDaOfSCmH85/D0kuyTG7mYIMdBtFXB/IU0QC9USCSGcUGSnQAEx8S0vaXL7JP043kfEfeqwsea598qX+LFa2UfGwgLBpiWi4QEfYy6fviz2TFkbRYKQImybidzUHZkljjPupqu8U4dIx/jsJM/vew717xZPCU0ZCho77TIU+bYSitD5mjnzuD7LrAdbFgnhkD2sQlD/hUW40kPVT/Tq3DrpDRKC9tniiTaIQV1Pe0k82XwYrvV/hTl8T1ed6TuzhmUggqowAbJRbaBIa1zI672AFFQM8OBIN59ZlLy3V2RZW4fvQk2/xMRdVBT0W5Upx+9rCbH9LCGWL8gNNA/PRJ0L9Ts6cq8kf4tFhFQQrk= pbsds@bjarte" - #"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7Ftu1LP+p+D6YWIo32V9w6ckHCIbrQWPyCNU4rBAbl root@bjarte" #"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDlLTAf5ObSpUU490M/l6+s5m0rxayPeaH23RLvIyoCqGftf/3Yi2iHP8wusBWGrEkXg8Po9YKh2CztflqJBnhsv/HaGYRXNsz3oVf2bSURUepZBkUXkg+T1x9OGG8pfvde8ROWZ8KxwLbAKghHUusyAvtJE9ktDxLpajomXDQlo+v7Hj2v4tMKCG/vHPxf/ni3Icl/8Rwo4zjuxl1MxLftPZv9rxCFv06ujuW6f6Mu5q+damt6ReH7RpOzs1rtDjPSnrRCboY4IbT5P4v6cZCr5hgAblKXHfOzPO9WM7O9tugJeE7eJK6Ps8gvWSHs/48SONSpjcYX3NzsRfxp6RRyD0yGrTDP/Ly6TNZzwZdKPO6GkRbLFXAxSn+ex/zW//R4ECQmof3KPYyjpt7yygICSdRlRocpz5aYxytFqBhelEbQqSZTP8q3HdxqGUplAgaCc0bK+m2ob5cirx3kHK2TyQ2dyCZgOML7AjD3GaclxPjkfEipL3/uFkq6EdsdQFs= pbsds@Svanbjorg" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCo5/9uHIKhhpVbcLSKslj9wdBiV4YaY/tydTfypNZBMMP2U54640t8JvHHkxCZRur8AqYupellxAqkmKn516Ut0WvfQcNgF7ieI66JHkK1j7kSFHHG1nkJHslwCh2PeYtfx5zHZZq8X9v/UjVGY182BC4BHC5zixmNiUvvc+N24BRT4NwslFmMYVcTdoNBSJXPgte4uUd+FZrAnHQrjYdJVANgI4i1d11mxlDFgJrPJj30KaIDxHAsAWgCEqGLMDO9N1cpGGbXVeXfoGvv+vdCXgbyA8BK7wWwXvy5HlvhpEJo8g84r6uKMMkEf+K1MpTiaNjdu+7/sKD/ZOyDB4RgCBs0DskouWRi+xfxABaKBj6706Z3hpj+GfpuSXrHKgGYXIL4cZHaAlz8GVsN1mUL4eJ12Sk14Od2QUHbzp7TDz5eaWuczPs5W9qXwNDMZcmBBZ3mkt9ZYPvAPRjeLpAKhhA9xPL3hbob5hhAENTWsFRFJEgpm8l362XFIOLHr/M= pbsds@rocm" #"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDHV25/jfk0upLl6JOq1tu1n+VNkMr0OOu8nZa3NBZQfqrGiLQuTTFycBd5hhoWBaZewb0R8jm/GESE4gfeiLtObe0bKXo8SVty5hNrIq06BbICXByJR99ux17psaNyp/dvZO7gkjKm3m30q7TfbZANlIwhv0XmqCz8S31ocJddFznWyK3nFau/Lvzpupi0Y+7yHkmcKiWYzZsjluQF90M5X5nIf2x4jj7WY0IkR2l41MOLk4NCQNIor6EyAXnHs78JBS3kY5p2x7t/cBpMDBmbgZePdfjGv/L4vFgYiG1wTZT77PWPA93GHueZWDGUkIvKbNriP/U+bShKnGjIfZttjerhzsFE1V/RctCFToqHkW39439nCj6eFpgUiLHkx/mAUPz/whKP+9x5I3/DQkgYZ7qA424Msdz2wXWNi3465Mtrf5XPsjWNReEWt9I29W19K5OLO9QQVrkgdioSCvxoHLvQypPscPkLVF8srzCVA6npUOrOuJ5zZcK1ax2/0v8= pbsds@frotbjoff" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDX1n/zBp0Va5VPgUHDJ2tLhR8kzQmkWIdFNVy3WHMzfx2ppR0+ch05ksZ7VYp3ROSMpykdqcjDekM6fD+BJEaHx9MwmHlFgvIVyIVwMwqtheo1gAHW6InsF41c7VRv3dlZgX8ViM9kR6YxCsy8FLkwcRtnQkMnT24LpLvmI6dZA26jAmYvxDO0iSD+7jBf+k1MFJZMxg14tMIcqMnuUhR0OyfORslafM73MKSwFqPeNvJxTq96we5RNBoZfZ63LmAm+EJ/++xoCATWQuSnbrXzIC/tUfHLbn9JUE6OgbTLOCarf/aUQHD5jeevfmNu8DYwtjrqcQsjDt2RySTX1R0OgXDbJe+voOY+9a6mSkpYV37CL5rJGTZYFxLLlC2BZMhmhl/axsK/YGyki9z0zKey65MDl5GxOEaTmVqkextiLMp3qBxvCEOzE6/MsVrOkX/gbNglqFlCVPXxKDBsm5NM/KbqPFuntX+w9UReTAS8MBwBDLM3z0dqT8MaK400wmM= pbsds@noximilien" - #"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7fYndgIXJM+tLSfkbprWc8ClOI58wlaZCg6I+wMYINeOwxLU24BmIyQAhNeqhHYBdXiyIAl5KN3+YajN1nx6zq2XPXLut31Xtf+0yMdRMX4rXgqOnsBeG4eTfNsPx+v7VNANth8dIADpk59Y9ioWB6JI6NF0wfkqrCSTpt2q9gpTA35MBe41hlaxqxYGq+PlfZyJbN4TJCORZROkjw1P6K+EoYUHTHmduMZSAnpzx5bTHL2r1VK1jLRL4q2O1LP9G7eVYUsZKxKznJqtAeoOGBL4OX2JeIXT51/pXTW0NNyVPELD6aUUZjK8aVK2JDXupXegYO8cHqwLaz7rZj3G8evGamSlGvAYR4Gwvvp4Du8ZRZVM3Gt1allhPMTLnm/gy9Lta35D8SHH0IUKWD3buo5HZliZgSMAvoSrT03vpuGILLoWEkTjpPT0qKIlBd/qlACBzKC9Wwmda5WWgMsfe0zP4zNLVdves5nkMrbY91TYSFM0FuDCaRsK5Mrhx7i0= root@noximilien" #"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBHdkKmRB0WjD3L+k8GNTVJDLpOUqLBMW17ld/Jzapo6 pbsds@bolle" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpuDBMll1viLKd/wm1lCy9iozyKeXMBHDwhdJOpeRLe pbsds@nord" - #"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINnS1TmV9q7n+s7+RouuB6vQllnhqNCE1RqPmTMJ2/29 root@nord" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOm2UFDD+qsnKvlBBZ/nhBqY9yeLewwF/bexD2SUL7E3 pbsds@sopp" - #"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6eTQkxO/1XflHpGf3478+Z7HFYYaf1d4M6mvSK2nAU root@sopp" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJVohqGMKp/UEZtb71RSBBXOEGX4o3lN5GYBlP7HEKbs root@brumlebasse" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILocbYCqu63RT2+mE0l+ZWWw9RVHNcydtLXbLklg6oPe pederbs@pvv" # key has passwd "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIIGcGEhM6qo3ARAsHx8V/FhryVaG0gOLmL6J1NL3fyn user@pinebook" diff --git a/users/pbsds/home/profiles/ssh.nix b/users/pbsds/home/profiles/ssh.nix index 70d6d77..573c24a 100644 --- a/users/pbsds/home/profiles/ssh.nix +++ b/users/pbsds/home/profiles/ssh.nix @@ -41,8 +41,6 @@ "garp.pbsds.net".proxyJump = "login.pvv.ntnu.no"; "eple.pbsds.net".proxyJump = "login.pvv.ntnu.no"; "bolle.pbsds.net".proxyJump = "login.pvv.ntnu.no"; - "pederbs.idi.ntnu.no" = {}; - "brumlebasse.pbsds.net".port = 2222; "knut.pbsds.net".port = 23; "nord.pbsds.net".port = 24; "sopp.pbsds.net".port = 26;