Move Envy back to Pear

flake.nix

@@ -78,7 +78,7 @@
     nixosConfigurations = {
       tower = mkNix [ ./hosts/tower ] stable; # Main Desktop
 
-      envy = mkNix [ ./hosts/envy ] stable; # HP Convertable
+      pear = mkNix [ ./hosts/pear ] stable; # MacBook Pro 14,1
       intuos = mkNix [ ./hosts/intuos ] stable; # Wacom Intuos Tablet
       jupiter = mkNix [ ./hosts/jupiter ] unstable; # Steam Deck
       redmond = mkNix [ ./hosts/redmond ] stable; # Lenovo Dual-Boot

hosts/envy/filesystems/default.nix

@@ -1,23 +0,0 @@
-{ config, ... }:
-{
-  fileSystems = {
-    # Secondary drive
-    "/persist/storage" = {
-      device = "/dev/disk/by-uuid/135281e2-72ec-4c00-91e8-9897a32c02ce";
-      fsType = "btrfs";
-      options = [
-        "nofail"
-        "nosuid"
-      ];
-    };
-    "/persist/home/${config.sysusers.main}/.local/share/Steam" = {
-      device = "/dev/disk/by-uuid/135281e2-72ec-4c00-91e8-9897a32c02ce";
-      fsType = "btrfs";
-      options = [
-        "nofail"
-        "nosuid"
-        "subvol=Steam"
-      ];
-    };
-  };
-}

hosts/envy/hardware/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, modulesPath, ... }:
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd = {
-    availableKernelModules = [
-      "xhci_pci"
-      "sr_mod"
-    ];
-    kernelModules = [ "dm-snapshot" ];
-  };
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/pear/boot/default.nix

@@ -2,7 +2,7 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    lanzaboote.enable = true;
+    loader.systemd-boot.enable = true;
     plymouth.enable = true;
   };
 }

hosts/pear/default.nix

@@ -3,14 +3,13 @@
   imports = [
     ./boot
     ./disko
-    ./filesystems
     ./hardware
     ./services
     ./users
     ../../modules/system
   ];
 
-  networking.hostName = "envy";
+  networking.hostName = "pear";
 
   system = {
     desktop.enable = true;

hosts/pear/hardware/default.nix

@@ -0,0 +1,30 @@
+{ config, lib, modulesPath, ... }:
+{
+  imports = [
+    (modulesPath + "/hardware/network/broadcom-43xx.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "nvme"
+        "sd_mod"
+        "usb_storage"
+        "xhci_pci"
+      ];
+      kernelModules = [
+        "applespi"
+        "atkbd"
+        "dm-snapshot"
+        "intel_lpss_pci"
+        "spi_pxa2xx_platform"
+      ];
+    };
+    kernelModules = [ "kvm-intel" ];
+  };
+
+  networking.useDHCP = lib.mkDefault true;
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/system/users/main/default.nix

@@ -14,7 +14,7 @@
       openssh.authorizedKeys.keyFiles = [
         ../../../../hosts/tower/id_ed25519.pub
 
-        ../../../../hosts/envy/id_ed25519.pub
+        ../../../../hosts/pear/id_ed25519.pub
         ../../../../hosts/intuos/id_ed25519.pub
         ../../../../hosts/jupiter/id_ed25519.pub
         ../../../../hosts/redmond/id_ed25519.pub