chore: merge remote-tracking branch 'refs/remotes/origin/master'

hosts/dandelion/default.nix

@@ -0,0 +1,45 @@
+{ pkgs, config, ... }: 
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./variables.nix
+    ./../../modules/core/default.server.nix
+    ./../../modules/services/dandelion.nix
+  ];
+
+  networking.hostName = "dandelion";
+
+  nixpkgs.config.permittedInsecurePackages = [
+    "jitsi-meet-1.0.8043"
+    "olm-3.2.16"
+  ];
+
+  time.timeZone = "Europe/Amsterdam";
+
+  environment.systemPackages = with pkgs; [
+    kitty.terminfo
+    zfs
+  ];
+
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    supportedFilesystems = [ "zfs" ];
+  };
+
+  networking.hostId = "8a6b2565";
+
+  services.zfs = {
+    autoScrub.enable = true;
+    trim.enable = true;
+  };
+
+  boot.zfs.extraPools = [ "terrabite" ];
+
+  # fileSystems."/terrabite/main" = {
+  #   device = "terrabite/main";
+  #   fsType = "zfs";
+  # };
+}

hosts/dandelion/hardware-configuration.nix

@@ -0,0 +1,39 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; # "uhci_pci"
+      kernelModules = [ ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/adb2894c-18f5-466a-b340-70b71b479f51";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/D8DA-9F5E";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/dandelion/variables.nix

@@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkOption types;
+  inherit (config.liv) variables;
+in {
+  options.liv.variables.dandelion = {
+    thisMachine = mkOption {
+      default = "dandelion.srv.${variables.primaryDomain}";
+      type = types.str;
+      readOnly = true;
+      description = "Domain of this specific machine";
+    };
+  };
+}

hosts/sakura/default.nix

@@ -24,6 +24,7 @@
     laptop.enable = true;
     desktop.enable = true;
     creative.enable = true;
+    amdgpu.enable = true;
   };
 
   services.hardware.bolt.enable = true;

hosts/violet/default.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./../../modules/core/default.violet.nix
+    ./../../modules/core/default.server.nix
     ./../../modules/services/violet.nix
   ];
 
@@ -25,6 +25,8 @@
     nvidia.open = false; # Set to false/true for proprietary/open drivers
   };
 
+  liv.nvidia.enable = true;
+
   services.xserver.videoDrivers = [ "nvidia" ];
 
   boot = {

hosts/yoshino/default.nix

@@ -16,6 +16,7 @@
   liv = {
     desktop.enable = true;
     creative.enable = true;
+    amdgpu.enable = true;
   };
 
   networking = {