From 50811aad7788b0216bc839255acefcaaaa4599bd Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Thu, 19 Dec 2024 19:36:10 -0500
Subject: [PATCH] Set up building an ISO from the config.

---
 nix/configuration/configuration.nix      |  2 +
 nix/configuration/flake.nix              | 48 +++++++++++++-----------
 nix/configuration/roles/sway/default.nix |  2 +-
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix
index 7445faf..b81915e 100644
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -14,6 +14,8 @@
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nix.settings.trusted-users = [ "@wheel" ];
 
+  boot.kernelPackages = pkgs.linuxPackages_6_11;
+
   users.mutableUsers = false;
   users.users.talexander = {
     isNormalUser = true;
diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix
index 24408ee..addef4e 100644
--- a/nix/configuration/flake.nix
+++ b/nix/configuration/flake.nix
@@ -1,3 +1,5 @@
+# Build ISO image
+#   doas nix run github:nix-community/nixos-generators -- --flake .#odo --format iso
 {
   description = "My system configuration";
 
@@ -53,33 +55,35 @@
         })
       ];
     };
+    odo = nixpkgs.lib.nixosSystem rec {
+      system = "x86_64-linux";
+      specialArgs = {
+        pkgs-b93b4e9b5 = import nixpkgs-b93b4e9b5 {
+          inherit system;
+          # config.allowUnfree = true;
+        };
+        pkgs-unstable = import nixpkgs-unstable {
+          inherit system;
+          # config.allowUnfree = true;
+        };
+      };
+      modules = [
+        impermanence.nixosModules.impermanence
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+        }
+        ./configuration.nix
+      ];
+    };
   in
     {
       # doas nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#vms.odo
       # ./result/bin/run-nixos-vim
       vms.odo = odoqemu.config.system.build.vm;
-      nixosConfigurations.odo = nixpkgs.lib.nixosSystem rec {
-        system = "x86_64-linux";
-        specialArgs = {
-          pkgs-b93b4e9b5 = import nixpkgs-b93b4e9b5 {
-            inherit system;
-            # config.allowUnfree = true;
-          };
-          pkgs-unstable = import nixpkgs-unstable {
-            inherit system;
-            # config.allowUnfree = true;
-          };
-        };
-        modules = [
-          impermanence.nixosModules.impermanence
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-          }
-          ./configuration.nix
-        ];
-      };
+      odoiso = odo.config.system.build.isoImage;
+      nixosConfigurations.odo = odo;
       nixosConfigurations.odovm = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         specialArgs = {
diff --git a/nix/configuration/roles/sway/default.nix b/nix/configuration/roles/sway/default.nix
index 6061322..c90e860 100644
--- a/nix/configuration/roles/sway/default.nix
+++ b/nix/configuration/roles/sway/default.nix
@@ -46,7 +46,7 @@ in
     alacritty
     firefox
   ];
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   environment.sessionVariables = {
     WLR_RENDERER_ALLOW_SOFTWARE = "1";