From 14b7de30f6a983c38e2a0ee8ad56db4209e89515 Mon Sep 17 00:00:00 2001
From: John Ogle <john@ogle.fyi>
Date: Tue, 29 Jul 2025 15:29:48 -0700
Subject: [PATCH] [live-usb] Clean up config

Also switched from trying to override the `nixos` user to instead just
installing home-manager _into_ the `nixos` user. It felt a bit like
fighting the tide otherwise.
---
 flake.nix                           |  6 +++++-
 machines/live-usb/configuration.nix | 16 +++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index e177006..78d8685 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,7 +80,11 @@
       modules = baseModules ++ [
         ./machines/live-usb/configuration.nix
         {
-          home-manager.users.johno = import ./home/home.nix;
+          home-manager.users.nixos = { ... }: {
+            imports = [ ./home/home.nix ];
+            home.username = nixpkgs.lib.mkForce "nixos";
+            home.homeDirectory = nixpkgs.lib.mkForce "/home/nixos";
+          };
           home-manager.extraSpecialArgs = { inherit system; };
         }
       ];
diff --git a/machines/live-usb/configuration.nix b/machines/live-usb/configuration.nix
index aeacdf0..05f5bdd 100644
--- a/machines/live-usb/configuration.nix
+++ b/machines/live-usb/configuration.nix
@@ -11,9 +11,12 @@
   roles = {
     audio.enable = true;
     bluetooth.enable = true;
-    users = {
+    desktop = {
       enable = true;
-      extraGroups = [ "video" "wheel" "networkmanager" ];
+      kde = true;
+      x11 = true;
+      wayland = true;
+      sddm = true;
     };
   };
 
@@ -72,15 +75,6 @@
     };
   };
 
-  # Override default nixos user, set johno as the main user with password
-  users.users.nixos.enable = false;
-  users.users.johno = {
-    isNormalUser = true;
-    description = "John Ogle";  
-    extraGroups = [ "wheel" "networkmanager" "audio" "video" ];
-    password = "nixos";  # Simple password for live environment
-  };
-
   # ISO customization
   isoImage = {
     volumeID = "NIXOS-LIVE";