From fbbd6682d84e1d651c995cec8b21baceabc9dd73 Mon Sep 17 00:00:00 2001
From: Lauren Lagarde <lauren@lagarde.dev>
Date: Tue, 17 Jun 2025 22:00:35 -0500
Subject: [PATCH] Update bastion config

---
 flake.lock                         | 16 ++++++++--------
 flake.nix                          |  5 +++--
 systems/bastion/bastion-actual.nix |  2 +-
 systems/bastion/bastion_base.nix   |  8 ++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index b1e4a49..c09903b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -141,11 +141,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-pYpD+mKj2FS//91FsFc7YfemYBNLrFwXev9v3Q4JUEo=",
-        "path": "/nix/store/505ys9vsc77f4h0jsbs2dvm144v01gj9-source/modules/mlaga97-home-manager",
+        "path": "/nix/store/f82hk4y5iqxfszj9wf748rrlv63dvx64-source/modules/mlaga97-home-manager",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/505ys9vsc77f4h0jsbs2dvm144v01gj9-source/modules/mlaga97-home-manager",
+        "path": "/nix/store/f82hk4y5iqxfszj9wf748rrlv63dvx64-source/modules/mlaga97-home-manager",
         "type": "path"
       }
     },
@@ -252,9 +252,9 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-QJFvxzBCZHVjWApIe4KaxC3gRd5d1QgDT3xJNetMwVE=",
-        "path": "/nix/store/n9acswl48815yv56dqwszbm2s80rlf7r-nixos-24.05.20240531.805a384/nixos",
+        "lastModified": 0,
+        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
+        "path": "/nix/store/nj8ah8wp5sxbah6qmqarv8cg7yrg7f0b-source",
         "type": "path"
       },
       "original": {
@@ -294,11 +294,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1722915115,
-        "narHash": "sha256-kkH01G1ViT7N/0gNQVcsPMxyrhn+rPFGeGHK3w2Xryo=",
+        "lastModified": 1748247366,
+        "narHash": "sha256-+uQh9e8F8KjC5HzHCztvDvW4xZdI4TZVxNFjaesL338=",
         "owner": "liff",
         "repo": "waveforms-flake",
-        "rev": "49ef7864932c4428b628791cd7cfccc694717ee8",
+        "rev": "7b5dc468bfb2a284f97d29b91f9a9fe5acd5a673",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9724547..28e19d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,9 +87,8 @@
     ];
 
     inherited_modules = inherited_modules_lite ++ [
-      lix-module.nixosModules.default
-      waveforms.nixosModule
       disko.nixosModules.default
+      lix-module.nixosModules.default
     ];
   in {
     nixosConfigurations = {
@@ -102,6 +101,7 @@
           }
           ./systems/ll-latitude-e5591.nix
           ./disko/nvme/uefi-luks-lvm-ext4.nix
+          waveforms.nixosModule
         ] ++ inherited_modules;
         specialArgs = { inherit inputs pkgs-unstable; };
       };
@@ -260,6 +260,7 @@
             };
           }
           ./systems/ll-nixos-full.nix
+          waveforms.nixosModule
         ] ++ inherited_modules;
         specialArgs = {
           inherit inputs pkgs-unstable;
diff --git a/systems/bastion/bastion-actual.nix b/systems/bastion/bastion-actual.nix
index 7132e37..47a3a48 100644
--- a/systems/bastion/bastion-actual.nix
+++ b/systems/bastion/bastion-actual.nix
@@ -9,7 +9,7 @@
   imports = [
     ./bastion_base.nix
 
-    ../../features/intelgpu.nix
+    ../../features/gpu/intel.nix
     ../../tweaks/powersave.nix
 
     ../../features/frigate-mpv-cage.nix
diff --git a/systems/bastion/bastion_base.nix b/systems/bastion/bastion_base.nix
index d44d704..5043041 100644
--- a/systems/bastion/bastion_base.nix
+++ b/systems/bastion/bastion_base.nix
@@ -5,10 +5,10 @@
     ../../features/headless.nix
 
     # Features
-    ../../features/br0.nix
-    ../../features/dockge.nix
-    ../../features/docker.nix
-    ../../features/libvirt.nix
+    ../../features/networking/networkd-br0.nix
+    ../../features/virtualization/dockge.nix
+    ../../features/virtualization/docker.nix
+    ../../features/virtualization/libvirt-host.nix
 
     # Tweaks
     ../../tweaks/zfs.nix