New config for new laptop

home/Aloria.nix

@@ -31,7 +31,8 @@
     # wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; # Intel
     wayland.windowManager.hyprland.settings = {
         exec-once = [
-            "${pkgs.swaylock-fancy}/bin/swaylock-fancy"
+            # "${pkgs.swaylock-fancy}/bin/swaylock-fancy"
+            "${pkgs.alsa-utils}/bin/alsactl init"
         ];
         monitor = [
             "eDP-1,1920x1080@144,0x0,1"

hosts/Aloria/default.nix

@@ -4,7 +4,6 @@ let
 in {
     imports = [
         (import ../Common/default.nix { inherit inputs pkgs config; })
-        (import ../Common/nvidia.nix { inherit inputs pkgs config; })
         (import ../Common/desktop.nix { inherit inputs pkgs config; })
         (import ../Common/nfs.nix { inherit pkgs serverIP; })
     ];
@@ -21,8 +20,7 @@ in {
     boot.initrd.supportedFilesystems = [ "zfs" ];
     boot.supportedFilesystems = [ "zfs" ];
     services.zfs.autoScrub.enable = true;
-    networking.hostname = "Aloria";
-    networking.hostid = "4e859062";
+    networking.hostId = "4e859062";
     networking.interfaces.wlan0.useDHCP = lib.mkDefault false;
     networking.wireless.iwd.enable = true;
     networking.wireless.iwd.settings = {

hosts/Aloria/hardware-configuration.nix

@@ -4,38 +4,40 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-    imports =
-        [
-            (modulesPath + "/installer/scan/not-detected.nix")
-        ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-    boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ "kvm-intel" ];
-    boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
-    fileSystems."/" =
-        {
-            device = "/dev/disk/by-uuid/e34f26e4-2f68-4f9c-ab7d-836b4f4b9f74";
-            fsType = "ext4";
-        };
+  fileSystems."/" =
+    { device = "rpool/root";
+      fsType = "zfs";
+    };
 
-    fileSystems."/boot" =
-        {
-            device = "/dev/disk/by-uuid/90D9-F457";
-            fsType = "vfat";
-            options = [ "fmask=0077" "dmask=0077" ];
-        };
+  fileSystems."/home" =
+    { device = "rpool/home";
+      fsType = "zfs";
+    };
 
-    swapDevices = [ ];
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/0A4D-063E";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
-    # 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.wlo1.useDHCP = lib.mkDefault true;
+  swapDevices = [ ];
 
-    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  # 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.wlo1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/Common/default.nix

@@ -12,7 +12,6 @@
     boot.loader.efi.canTouchEfiVariables = true;
     systemd.extraConfig = "DefaultTimeoutStopSec=10s";
     systemd.services.systemd-user-sessions.enable = false;
-    boot.kernelPackages = pkgs.linuxPackages_latest;
     boot.tmp.cleanOnBoot = true;
 
     powerManagement.enable = true;

hosts/Kell/default.nix

@@ -8,6 +8,9 @@ in {
         (import ../Common/nfs.nix { inherit pkgs serverIP; })
     ];
 
+    # Kernel
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+
     # AMD CPU
     boot.blacklistedKernelModules = [ "k10temp" ];
     boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ];

hosts/Riva/default.nix

@@ -8,6 +8,7 @@ in {
         (import ../Common/nfs.nix { inherit pkgs serverIP; })
     ];
 
+    boot.kernelPackages = pkgs.linuxPackages_latest;
     services.ollama = {
         enable = true;
     };