Merge pull request 'retire vf2 from config' (#623) from retire-vf2 into main

Reviewed-on: #623

config/programs/builders.nix

@@ -31,7 +31,7 @@
         user = "backup";
       };
       "build-riscv" = {
-        hostname = "vf2.int.chir.rs";
+        hostname = "not522.tailbab65.ts.net";
         identitiesOnly = true;
         identityFile = "${config.home.homeDirectory}/.ssh/builder_id_ed25519";
         port = 22;

config/services/hydra.nix

@@ -35,7 +35,7 @@
       Port 22
       IdentitiesOnly yes
       User remote-build
-      HostName vf2.int.chir.rs
+      HostName not522.tailbab65.chir.rs
       IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519
 
     Host *

config/vf2.nix

@@ -1,123 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  nixpkgs,
-  nixos-hardware,
-  riscv-overlay,
-  lix,
-  ...
-} @ args: let
-  pkgs_x86_64 = import nixpkgs {
-    system = "x86_64-linux";
-    crossSystem.system = "riscv64-linux";
-    overlays = [lix.overlays.default];
-  };
-in {
-  networking.hostName = "vf2";
-  networking.hostId = "ad325df9";
-  imports = [
-    ./services/caddy
-    ./services/acme.nix
-    ./users/remote-build.nix
-    ./systemd-boot.nix
-    "${nixos-hardware}/starfive/visionfive/v2/default.nix"
-  ];
-
-  nixpkgs.config.allowUnsupportedSystem = true;
-
-  nixpkgs.overlays = [
-    riscv-overlay.overlays.default
-    (self: super: {
-      inherit (pkgs_x86_64) lix nixos-option;
-    })
-  ];
-
-  nix.settings.substituters = lib.mkForce [
-    "https://beam.attic.rs/riscv"
-    "https://cache.ztier.in"
-    "https://hydra.int.chir.rs"
-  ];
-
-  fileSystems = {
-    "/boot" = {
-      device = "/dev/nvme0n1p1";
-      fsType = "vfat";
-      options = ["nofail"];
-    };
-    "/" = {
-      device = "/dev/nvme0n1p2";
-      fsType = "btrfs";
-      options = ["compress=zstd"];
-    };
-  };
-  swapDevices = [
-    {
-      device = "/dev/nvme0n1p3";
-    }
-  ];
-  #  hardware.deviceTree.name = "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
-  home-manager.users.darkkirb = import ./home-manager/darkkirb.nix {
-    desktop = false;
-    inherit args;
-  };
-  nix.settings.cores = 4;
-  nix.settings.max-jobs = 4;
-  nix.settings.system-features = [
-    "nixos-test"
-    "big-parallel"
-    "benchmark"
-    "ca-derivations"
-    # There are many more combinations but i simply do not care lol
-    "gccarch-rv64gc_zba_zbb"
-    "gccarch-rv64gc_zba"
-    "gccarch-rv64gc_zbb"
-    "gccarch-rv64gc"
-    "gccarch-rv32gc_zba_zbb"
-    "gccarch-rv32gc_zba"
-    "gccarch-rv32gc_zbb"
-    "gccarch-rv32gc"
-    "native-riscv"
-  ];
-  nix.daemonCPUSchedPolicy = "idle";
-  nix.daemonIOSchedClass = "idle";
-  services.tailscale.useRoutingFeatures = "server";
-
-  boot.binfmt.emulatedSystems = [
-    "x86_64-linux"
-  ];
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.generic-extlinux-compatible.enable = false;
-  #system.requiredKernelConfig = lib.mkForce [];
-
-  system.stateVersion = "24.05";
-
-  boot.loader.systemd-boot.extraInstallCommands = ''
-    set -euo pipefail
-    ${pkgs.coreutils}/bin/cp --no-preserve=mode -r ${config.hardware.deviceTree.package} ${config.boot.loader.efi.efiSysMountPoint}/
-    for filename in ${config.boot.loader.efi.efiSysMountPoint}/loader/entries/nixos*-generation-[1-9]*.conf; do
-      if ! ${pkgs.gnugrep}/bin/grep -q 'devicetree' $filename; then
-        ${pkgs.coreutils}/bin/echo "devicetree /dtbs/${config.hardware.deviceTree.name}" >> $filename
-      fi
-    done
-  '';
-  hardware.deviceTree.name = "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
-  boot.initrd.kernelModules = [
-    "dw_mmc-starfive"
-    "motorcomm"
-    "dwmac-starfive"
-    "cdns3-starfive"
-    "jh7110-trng"
-    "phy-jh7110-usb"
-    "clk-starfive-jh7110-aon"
-    "clk-starfive-jh7110-stg"
-    "clk-starfive-jh7110-vout"
-    "clk-starfive-jh7110-isp"
-    "clk-starfive-jh7100-audio"
-    "phy-jh7110-pcie"
-    "pcie-starfive"
-    "nvme"
-  ];
-  systemd.network.enable = true;
-  networking.useNetworkd = true;
-}

flake.lock

@@ -961,26 +961,6 @@
         "type": "github"
       }
     },
-    "riscv-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1728672381,
-        "narHash": "sha256-7zs+Kb4FaClPojFHIv7Wg4YH6B9/PpP2f0o9+5QIA7U=",
-        "owner": "DarkKirb",
-        "repo": "riscv-overlay",
-        "rev": "47b3b0e989ff06046004be0c76d24af9a46a0c29",
-        "type": "github"
-      },
-      "original": {
-        "owner": "DarkKirb",
-        "repo": "riscv-overlay",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "admin-fe": "admin-fe",
@@ -1012,7 +992,6 @@
         "nixos-vscode-server": "nixos-vscode-server",
         "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks_2",
-        "riscv-overlay": "riscv-overlay",
         "rust-overlay": "rust-overlay",
         "sops-nix": "sops-nix",
         "systems": "systems"

flake.nix

@@ -150,10 +150,6 @@ rec {
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
-    riscv-overlay = {
-      url = "github:DarkKirb/riscv-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -199,10 +195,6 @@ rec {
         name = "rainbow-resort"; # PC
         system = "x86_64-linux";
       }
-      {
-        name = "vf2"; # vision five 2
-        system = "riscv64-linux";
-      }
       /*
         {
         name = "devterm";
@@ -324,7 +316,6 @@ rec {
     overlays = {
       x86_64-linux = import ./overlays args "x86_64-linux";
       aarch64-linux = import ./overlays args "aarch64-linux";
-      riscv64-linux = import ./overlays args "riscv64-linux";
     };
     devShell.x86_64-linux = let
       pkgs = import nixpkgs {