From 7cd5e7d8ddd155f5d86dbfe4beab05da0a75835b Mon Sep 17 00:00:00 2001
From: alyx <alyxwren@proton.me>
Date: Mon, 23 Feb 2026 17:33:45 +0000
Subject: [PATCH] get rid of default.nix stub for apalapucia, move
 apalapucia.nix to default.nix, less unnecessary files

---
 hosts/apalapucia/apalapucia.nix | 67 ---------------------------------
 hosts/apalapucia/default.nix    | 66 +++++++++++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 69 deletions(-)
 delete mode 100644 hosts/apalapucia/apalapucia.nix

diff --git a/hosts/apalapucia/apalapucia.nix b/hosts/apalapucia/apalapucia.nix
deleted file mode 100644
index 6424708..0000000
--- a/hosts/apalapucia/apalapucia.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, pkgs, lib, inputs, ...}:{
-
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  boot.initrd.luks.devices = {
-    crypted = {
-      device = "/dev/disk/by-partuuid/79ab4cc0-b596-42ed-ad00-69031b01b09b";
-      allowDiscards = true;
-      preLVM = true;
-    };
-  };
-
-  systemd.packages = with pkgs; [lact]; 
-
-  programs.bash.shellAliases = {
-    nano = "nvim";
-  };
-
-  services.displayManager.ly = {
-    enable = true;
-    settings.animation = "colormix";
-  };
-
-  services.monado = {
-    enable = true;
-    defaultRuntime = true;
-  };
-
-  systemd.user.services.monado.environment = {
-    STEAMVR_LH_ENABLE = "1";
-    XRT_COMPOSITOR_COMPUTE = "1";
-    WMR_HANDTRACKING = "0";
-    AMD_VULKAN_ICD = "RADV";
-  };
-
-  services.udev.packages = with pkgs; [xr-hardware];
-
-  boot.kernelModules = [ "kvm-amd" "vhost_vsock" "vfio_virqfd" "vhost-net" "vfio_pci" "vfio_iommu_type1" "vfio"];
-  boot.kernelParams = [ "amd_iommu=on" ];
-
-  services.printing.enable = true;
-  services.printing.drivers = [pkgs.gutenprint];
-
-  programs.virt-manager.enable = true;
-  users.groups.libvirtd.members = ["alyx"];
-  virtualisation.libvirtd.enable = true;
-  virtualisation.libvirtd.onBoot = "ignore";
-  virtualisation.libvirtd.onShutdown = "shutdown";
-  virtualisation.libvirtd.qemu.package = pkgs.qemu_kvm;
-  virtualisation.libvirtd.qemu.swtpm.enable = true;
-  virtualisation.libvirtd.qemu.runAsRoot = true;
-  virtualisation.spiceUSBRedirection.enable = true;
-
-  users.users."qemu-libvirtd" = {
-    extraGroups = [ "kvm" "input" ];
-    isSystemUser = true;
-  };
-
-  users.users.${config.var.username} = {
-    description = "Alyx Wren";
-    extraGroups = [ "networkmanager" "wheel" "camera" "input" "adbusers" "inputs" "uinput" "pipewire" "kvm" "qemu-libvirt" "qemu-libvirtd" "lxd" "libvirtd" ];
-  };
-}
-
-  
diff --git a/hosts/apalapucia/default.nix b/hosts/apalapucia/default.nix
index ee5ddac..df18e68 100644
--- a/hosts/apalapucia/default.nix
+++ b/hosts/apalapucia/default.nix
@@ -1,6 +1,68 @@
-{ config, pkgs, ... }:{
+{ config, pkgs, lib, inputs, ...}:{
+
   imports = [
-    ./apalapucia.nix
+    ./hardware-configuration.nix
     ../generic.nix
   ];
+
+  boot.initrd.luks.devices = {
+    crypted = {
+      device = "/dev/disk/by-partuuid/79ab4cc0-b596-42ed-ad00-69031b01b09b";
+      allowDiscards = true;
+      preLVM = true;
+    };
+  };
+
+  systemd.packages = with pkgs; [lact]; 
+
+  programs.bash.shellAliases = {
+    nano = "nvim";
+  };
+
+  services.displayManager.ly = {
+    enable = true;
+    settings.animation = "colormix";
+  };
+
+  services.monado = {
+    enable = true;
+    defaultRuntime = true;
+  };
+
+  systemd.user.services.monado.environment = {
+    STEAMVR_LH_ENABLE = "1";
+    XRT_COMPOSITOR_COMPUTE = "1";
+    WMR_HANDTRACKING = "0";
+    AMD_VULKAN_ICD = "RADV";
+  };
+
+  services.udev.packages = with pkgs; [xr-hardware];
+
+  boot.kernelModules = [ "kvm-amd" "vhost_vsock" "vfio_virqfd" "vhost-net" "vfio_pci" "vfio_iommu_type1" "vfio"];
+  boot.kernelParams = [ "amd_iommu=on" ];
+
+  services.printing.enable = true;
+  services.printing.drivers = [pkgs.gutenprint];
+
+  programs.virt-manager.enable = true;
+  users.groups.libvirtd.members = ["alyx"];
+  virtualisation.libvirtd.enable = true;
+  virtualisation.libvirtd.onBoot = "ignore";
+  virtualisation.libvirtd.onShutdown = "shutdown";
+  virtualisation.libvirtd.qemu.package = pkgs.qemu_kvm;
+  virtualisation.libvirtd.qemu.swtpm.enable = true;
+  virtualisation.libvirtd.qemu.runAsRoot = true;
+  virtualisation.spiceUSBRedirection.enable = true;
+
+  users.users."qemu-libvirtd" = {
+    extraGroups = [ "kvm" "input" ];
+    isSystemUser = true;
+  };
+
+  users.users.${config.var.username} = {
+    description = "Alyx Wren";
+    extraGroups = [ "networkmanager" "wheel" "camera" "input" "adbusers" "inputs" "uinput" "pipewire" "kvm" "qemu-libvirt" "qemu-libvirtd" "lxd" "libvirtd" ];
+  };
 }
+
+