From c04e4203eaae175831e2e5cd8f386ecc443bd371 Mon Sep 17 00:00:00 2001 From: Bun Date: Wed, 30 Apr 2025 19:34:43 -0400 Subject: [PATCH] Move Envy back to Pear --- flake.nix | 2 +- hosts/envy/filesystems/default.nix | 23 ---------------- hosts/envy/hardware/default.nix | 15 ----------- hosts/{envy => pear}/boot/default.nix | 2 +- hosts/{envy => pear}/default.nix | 3 +-- hosts/{envy => pear}/disko/default.nix | 0 hosts/pear/hardware/default.nix | 30 +++++++++++++++++++++ hosts/{envy => pear}/id_ed25519.pub | 0 hosts/{envy => pear}/services/default.nix | 0 hosts/{envy => pear}/users/default.nix | 0 hosts/{envy => pear}/users/main/default.nix | 0 modules/system/users/main/default.nix | 2 +- 12 files changed, 34 insertions(+), 43 deletions(-) delete mode 100644 hosts/envy/filesystems/default.nix delete mode 100644 hosts/envy/hardware/default.nix rename hosts/{envy => pear}/boot/default.nix (74%) rename hosts/{envy => pear}/default.nix (80%) rename hosts/{envy => pear}/disko/default.nix (100%) create mode 100644 hosts/pear/hardware/default.nix rename hosts/{envy => pear}/id_ed25519.pub (100%) rename hosts/{envy => pear}/services/default.nix (100%) rename hosts/{envy => pear}/users/default.nix (100%) rename hosts/{envy => pear}/users/main/default.nix (100%) diff --git a/flake.nix b/flake.nix index e66714f1..cd8f74c6 100644 --- a/flake.nix +++ b/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 diff --git a/hosts/envy/filesystems/default.nix b/hosts/envy/filesystems/default.nix deleted file mode 100644 index 9091a858..00000000 --- a/hosts/envy/filesystems/default.nix +++ /dev/null @@ -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" - ]; - }; - }; -} diff --git a/hosts/envy/hardware/default.nix b/hosts/envy/hardware/default.nix deleted file mode 100644 index 427451ba..00000000 --- a/hosts/envy/hardware/default.nix +++ /dev/null @@ -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; -} diff --git a/hosts/envy/boot/default.nix b/hosts/pear/boot/default.nix similarity index 74% rename from hosts/envy/boot/default.nix rename to hosts/pear/boot/default.nix index f6458c21..3cf63f7f 100644 --- a/hosts/envy/boot/default.nix +++ b/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; }; } diff --git a/hosts/envy/default.nix b/hosts/pear/default.nix similarity index 80% rename from hosts/envy/default.nix rename to hosts/pear/default.nix index 628a7f30..0e1484fa 100644 --- a/hosts/envy/default.nix +++ b/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; diff --git a/hosts/envy/disko/default.nix b/hosts/pear/disko/default.nix similarity index 100% rename from hosts/envy/disko/default.nix rename to hosts/pear/disko/default.nix diff --git a/hosts/pear/hardware/default.nix b/hosts/pear/hardware/default.nix new file mode 100644 index 00000000..cfa9a018 --- /dev/null +++ b/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; +} diff --git a/hosts/envy/id_ed25519.pub b/hosts/pear/id_ed25519.pub similarity index 100% rename from hosts/envy/id_ed25519.pub rename to hosts/pear/id_ed25519.pub diff --git a/hosts/envy/services/default.nix b/hosts/pear/services/default.nix similarity index 100% rename from hosts/envy/services/default.nix rename to hosts/pear/services/default.nix diff --git a/hosts/envy/users/default.nix b/hosts/pear/users/default.nix similarity index 100% rename from hosts/envy/users/default.nix rename to hosts/pear/users/default.nix diff --git a/hosts/envy/users/main/default.nix b/hosts/pear/users/main/default.nix similarity index 100% rename from hosts/envy/users/main/default.nix rename to hosts/pear/users/main/default.nix diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix index c4914633..42b2962f 100644 --- a/modules/system/users/main/default.nix +++ b/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