From a5826ad7c23eeeb8032b929e1352f68e6265863c Mon Sep 17 00:00:00 2001 From: Vice Date: Sat, 8 Mar 2025 01:50:08 -0500 Subject: [PATCH] Remove Lacros and update Midas kernel --- flake.nix | 1 - hosts/lacros/default.nix | 25 ------- hosts/lacros/disko/default.nix | 90 ------------------------ hosts/lacros/filesystems/default.nix | 11 --- hosts/lacros/hardware/default.nix | 11 --- hosts/lacros/users/default.nix | 4 -- hosts/lacros/users/main/default.nix | 8 --- hosts/{lacros => midas}/boot/default.nix | 0 hosts/midas/default.nix | 3 +- 9 files changed, 2 insertions(+), 151 deletions(-) delete mode 100644 hosts/lacros/default.nix delete mode 100644 hosts/lacros/disko/default.nix delete mode 100644 hosts/lacros/filesystems/default.nix delete mode 100644 hosts/lacros/hardware/default.nix delete mode 100644 hosts/lacros/users/default.nix delete mode 100644 hosts/lacros/users/main/default.nix rename hosts/{lacros => midas}/boot/default.nix (100%) diff --git a/flake.nix b/flake.nix index 470cb4d..a66ee31 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,6 @@ tower = mkNix [ ./hosts/tower ]; # Main Desktop envy = mkNix [ ./hosts/envy ]; # HP Convertable - lacros = mkNix [ ./hosts/lacros ]; # HP ChromeBook redmond = mkNix [ ./hosts/redmond ]; # Lenovo Dual-Boot iso = mkNix [ ./hosts/iso ]; # ISO File diff --git a/hosts/lacros/default.nix b/hosts/lacros/default.nix deleted file mode 100644 index a2fb343..0000000 --- a/hosts/lacros/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ ... }: -{ - imports = [ - ./boot - ./disko - ./filesystems - ./hardware - ./users - ../../modules/system - ]; - - networking = { - hostName = "lacros"; - hostId = "eb3a2dd3"; - wg-quick.interfaces.wgc.address = [ "10.100.0.26/24" ]; - }; - - system = { - desktop.enable = true; - lanzaboote.enable = true; - wireguard.client.enable = true; - libvirtd.enable = true; - stateVersion = "24.11"; - }; -} diff --git a/hosts/lacros/disko/default.nix b/hosts/lacros/disko/default.nix deleted file mode 100644 index cd0a3a8..0000000 --- a/hosts/lacros/disko/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ config, disko, ... }: -{ - imports = [ disko.nixosModules.disko ]; - - disko.devices = { - disk = { - "${config.networking.hostName}" = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - priority = 1; - size = "2G"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "${config.networking.hostName}-disk"; - settings.allowDiscards = true; - passwordFile = "/tmp/secret.key"; - content = { - type = "lvm_pv"; - vg = "${config.networking.hostName}"; - }; - }; - }; - }; - }; - }; - }; - - lvm_vg = { - "${config.networking.hostName}" = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%"; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/prev" = { - mountpoint = "/prev"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - - # Impermanence - "/persist" = { - mountpoint = "/persist"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/persist/.snapshots" = { }; - "/persist/home/${config.sysusers.main}" = { }; - "/persist/home/${config.sysusers.main}/.snapshots" = { }; - }; - }; - }; - swap = { - size = "4G"; - content = { - type = "swap"; - discardPolicy = "both"; - }; - }; - }; - }; - }; - }; - - # Needed for impermanence - fileSystems."/persist".neededForBoot = true; -} diff --git a/hosts/lacros/filesystems/default.nix b/hosts/lacros/filesystems/default.nix deleted file mode 100644 index 96d47e1..0000000 --- a/hosts/lacros/filesystems/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, ... }: -{ - fileSystems = { - # Network mounts - "/home/${config.sysusers.main}/KittyNFS" = { - device = "10.100.0.1:/export/KittyNFS"; - fsType = "nfs4"; - options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; - }; - }; -} diff --git a/hosts/lacros/hardware/default.nix b/hosts/lacros/hardware/default.nix deleted file mode 100644 index 018398b..0000000 --- a/hosts/lacros/hardware/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -# nixos-generate-config --root ./ --no-filesystems -{ config, lib, modulesPath, ... }: -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.kernelModules = [ "kvm-intel" "dm-snapshot" ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/lacros/users/default.nix b/hosts/lacros/users/default.nix deleted file mode 100644 index 57e7f20..0000000 --- a/hosts/lacros/users/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - imports = [ ./main ]; -} diff --git a/hosts/lacros/users/main/default.nix b/hosts/lacros/users/main/default.nix deleted file mode 100644 index 26b7a3a..0000000 --- a/hosts/lacros/users/main/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, lib, ... }: -{ - home-manager.users."${config.sysusers.main}".home = { - desktop.enable = true; - remote-desktop.enable = true; - stateVersion = lib.mkForce config.system.stateVersion; - }; -} diff --git a/hosts/lacros/boot/default.nix b/hosts/midas/boot/default.nix similarity index 100% rename from hosts/lacros/boot/default.nix rename to hosts/midas/boot/default.nix diff --git a/hosts/midas/default.nix b/hosts/midas/default.nix index fff98f7..b4bc51f 100644 --- a/hosts/midas/default.nix +++ b/hosts/midas/default.nix @@ -1,6 +1,7 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: { imports = [ + ./boot ./disko ./filesystems ./hardware