[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.
This commit is contained in:
@@ -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; };
|
||||
}
|
||||
];
|
||||
|
||||
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user