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

flake.nix

@@ -128,6 +128,16 @@
             inherit self inputs username;
           };
         };
+        daisy = nixpkgs.lib.nixosSystem {
+          inherit system;
+          modules = [
+            (import ./hosts/daisy)
+          ];
+          specialArgs = {
+            host = "daisy";
+            inherit self inputs username;
+          };
+        };
       };
     };
 }

hosts/daisy/default.nix

@@ -0,0 +1,48 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./../../modules/core/default.server.nix
+    # ./../../modules/services/violet.nix
+  ];
+
+  networking = {
+    hostName = "daisy";
+    networkmanager.enable = true;
+    firewall = {
+      allowedTCPPorts = [
+        # 80
+        # 443
+        # 25565
+        9123
+      ];
+    };
+  };
+
+  time.timeZone = "Europe/Amsterdam";
+
+  environment.systemPackages = with pkgs; [
+    pkgs.kitty.terminfo
+  ];
+
+  boot = {
+    loader.grub = {
+      enable = true;
+      device = "/dev/sdb";
+      useOSProber = true;
+    };
+    kernelModules = [ "acpi_call" ];
+    extraModulePackages =
+      with config.boot.kernelPackages;
+      [
+        acpi_call
+        cpupower
+      ]
+      ++ [ pkgs.cpupower-gui ];
+  };
+}

hosts/daisy/hardware-configuration.nix

@@ -0,0 +1,37 @@
+# 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 = [ "ehci_pci" "ahci" "uhci_hcd" "hpsa" "mpt3sas" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/02aaca49-be45-42ad-ba44-6f5dbfe9032e";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/40aff86f-c371-4f7f-ab62-5665c4f1c071"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno3.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno4.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/core/user.nix

@@ -26,6 +26,10 @@
           [ ./../home/default.server.nix ]
         else if (host == "posy") then
           [ ./../home/default.server.nix ]
+        else if (host == "hazel") then
+          [ ./../home/default.server.nix ]
+        else if (host == "daisy") then
+          [ ./../home/default.server.nix ]
         # else if (host == "yoshino") then
         # [ ./../home/default.nix ]
         else

roles/gui.nix

@@ -46,6 +46,9 @@ in
 
       # Gaming
       lunar-client
+
+      # Not GUI but specific to GUI usage
+      sshuttle
     ];
   };
 }