Finally switch to flakes.

nixos/hardware/machines/desktop.nix

@@ -0,0 +1,136 @@
+# This file was initially made by 'nixos-generate-config', try not to edit too much
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: let
+  # Set common boot paramaters
+  commonKernelParams = [
+    # Nvidia settings
+    "nvidia_drm.fbdev=1"
+
+    # VM/GPU passthrough
+    "amd_iommu=on"
+    "iommu=pt"
+    "nested=1"
+
+    # Virtualization nonsense
+    "transparent_hugepage=never"
+
+    # Isolate devices into IOMMU groups
+    "pcie_acs_override=downstream,multifunction"
+    "pci=routeirq"
+  ];              
+in {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  # Set all boot options
+  boot = {
+    # Set a kernel version and load/blacklist drivers    
+    kernelPackages = pkgs.unstable.linuxPackages_zen;    
+    blacklistedKernelModules = [
+      "pcspkr"
+    ];               
+    kernel.sysctl."vm.max_map_count" = 2147483642;       
+    kernelParams = commonKernelParams ++ [
+      "vfio-pci.ids=10de:1f82,10de:10fa"
+    ];
+    initrd = {
+      availableKernelModules = [
+        "nvme"
+	"xhci_pci"
+	"ahci"
+	"usbhid"
+	"usb_storage"
+	"sd_mod"
+      ];
+      kernelModules = [
+        "vfio"
+	"vfio_pci"
+	"vfio_iommu_type1"
+	"kvm-amd"
+      ];
+    };
+                                                         
+    # Manage supported filesystems                       
+    supportedFilesystems = {                             
+      ntfs = true;
+      zfs = lib.mkForce false;
+    };
+
+    # Modprobe settings
+    extraModprobeConfig = ''
+      options hid_apple fnmode=2
+    '';
+
+    # Use the Systemd-Boot bootloader
+    loader.systemd-boot = {
+      enable = true;
+      netbootxyz.enable = true;
+    };
+  };
+
+  # Additional entry to boot from the second GPU
+  specialisation = {
+    gputwo.configuration = {
+      boot.kernelParams = commonKernelParams ++ ["vfio-pci.ids=10de:2504,10de:228e"];
+    };
+  };
+
+  # Mount everything as necessary
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/f0786b07-8303-416f-87ff-276bfd696387";
+      fsType = "bcachefs";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/EF6D-9009";
+      fsType = "vfat";
+    };
+    "/etc/libvirt" = {
+      device = "/dev/disk/by-label/Qemu";
+      options = ["nosuid" "nodev" "nofail"];
+    };
+    "/var/lib/libvirt" = {
+      depends = ["/etc/libvirt"];
+      device = "/etc/libvirt/varlibvirt";
+      options = ["bind" "rw"];
+    };
+    "/mnt/Linux1" = {
+      device = "/dev/disk/by-label/Linux1";
+      options = ["nosuid" "nodev" "nofail" "x-gvfs-show"];
+    };
+    "/mnt/Linux2" = {
+      device = "/dev/disk/by-label/Linux2";
+      options = ["nosuid" "nodev" "nofail" "x-gvfs-show"];
+    };
+    "/mnt/Windows1" = {
+      device = "/dev/disk/by-label/Windows1";
+      options = ["nosuid" "nodev" "noauto"];
+    };
+    "/mnt/Windows2" = {
+      device = "/dev/disk/by-label/Windows2";
+      options = ["nosuid" "nodev" "noauto"];
+    };
+    "/home/jimbo/JimboNFS" = {
+      device = "server:/export/JimboNFS";
+      fsType = "nfs4";
+      options = ["x-systemd.automount" "_netdev" "nofail" "noauto"];
+    };
+  };
+
+  # Set the swap partition
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/2e4c5120-716d-4cdc-84a0-c9e6391760db";}
+  ];
+
+  # Enables DHCP on each ethernet and wireless interface.
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

nixos/hardware/machines/server.nix

@@ -0,0 +1,112 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  # Set all boot options
+  boot = {
+    blacklistedKernelModules = [
+      "pcspkr"
+    ];               
+    initrd = {
+      availableKernelModules = [
+        "xhci_pci"
+	"ehci_pci"
+	"ahci"
+	"nvme"
+	"usbhid"
+	"sd_mod"
+	"sr_mod"
+      ];
+      kernelModules = [
+        "kvm-intel"
+      ];
+    };
+
+    # Use the Systemd-Boot bootloader
+    loader.systemd-boot = {
+      enable = true;
+      netbootxyz.enable = true;
+    };
+  };
+
+  # Mounting options
+  fileSystems = {
+    "/" = { 
+      device = "/dev/disk/by-uuid/8f81cab7-9381-4950-b77f-b85c5fdbad16";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/2034-754A";
+      fsType = "vfat";
+    };
+    "/export/JimboNFS" = {
+      device = "/dev/disk/by-uuid/713fcd92-534c-4153-8e04-e0c6fe5f6a51";
+      fsType = "ext4";
+      noCheck = true;
+    };
+    "/home/jimbo/JimboNFS" = {
+      device = "/export/JimboNFS";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+
+    # Atrocity of var bindmounts
+    "/mnt/nextcloud/data/JimboNFS" = {
+      device = "/export/JimboNFS";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+    "/var/lib/bitwarden_rs" = {
+      device = "/export/JimboNFS/System/var/lib/bitwarden_rs";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+    "/var/lib/gitea" = {
+      device = "/export/JimboNFS/System/var/lib/gitea";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+    "/var/lib/matrix-synapse" = {
+      device = "/export/JimboNFS/System/var/lib/matrix-synapse";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+    "/var/lib/nextcloud" = {
+      device = "/export/JimboNFS/System/var/lib/nextcloud";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+    "/var/lib/owncast" = {
+      device = "/export/JimboNFS/System/var/lib/owncast";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+    "/var/lib/docker/volumes/azuracast_station_data/_data/jimbops/media/Music" = {
+      device = "/export/JimboNFS/Music";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+    "/var/lib/private/pufferpanel/servers" = {
+      device = "/export/JimboNFS/System/var/lib/pufferpanel/servers";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+    "/var/lib/mastodon" = {
+      device = "/export/JimboNFS/System/var/lib/mastodon";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+  };
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/ec422cad-bf93-4b15-b989-2c807f1073a4"; }
+  ];
+
+  # Enables DHCP on each ethernet and wireless interface.
+  networking.useDHCP = lib.mkDefault true;
+
+  # Hardware settings
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  boot.swraid.enable = true;
+}

nixos/hardware/nvidia.nix

@@ -0,0 +1,11 @@
+{config, ... }: {
+  # Enable video drivers                              
+  services.xserver.videoDrivers = ["nvidia"];         
+
+  hardware.nvidia = {                                 
+    modesetting.enable = true;
+    nvidiaSettings = false;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    open = true;
+  };
+}

nixos/hardware/opengl.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # Enable OpenGL
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+    extraPackages = with pkgs; [
+      vulkan-loader
+      vulkan-validation-layers
+      vulkan-extension-layer
+    ];
+  };
+}

nixos/hardware/wireless.nix

@@ -0,0 +1,7 @@
+{
+  # Enable wireless networkmanager
+  networking = {
+    networkmanager.enable = true;
+    enableB43Firmware = true;
+  };
+}