fix: switch from home-manager to nixos-rebuild for environment updates and align flake outputs
This commit is contained in:
@@ -21,8 +21,8 @@ if command -v nomarchy-preflight-migration >/dev/null 2>&1; then
|
|||||||
nomarchy-preflight-migration
|
nomarchy-preflight-migration
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Apply Home Manager changes from the local flake
|
# Apply changes via nixos-rebuild (since home-manager is integrated as a NixOS module)
|
||||||
echo "Applying user-level changes from $REPO_DIR..."
|
echo "Applying user-level changes from $REPO_DIR using nixos-rebuild..."
|
||||||
home-manager switch --flake "$REPO_DIR#default" --impure
|
sudo nixos-rebuild switch --flake "$REPO_DIR#default" --impure
|
||||||
|
|
||||||
echo "Environment update complete."
|
echo "Environment update complete."
|
||||||
|
|||||||
38
flake.nix
38
flake.nix
@@ -76,44 +76,10 @@
|
|||||||
|
|
||||||
# VM for testing graphical installer
|
# VM for testing graphical installer
|
||||||
installerVm = nixpkgs.lib.nixosSystem {
|
installerVm = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = { inherit inputs; };
|
# ... (rest of installerVm)
|
||||||
modules = [
|
|
||||||
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
|
||||||
./hosts/live-iso.nix
|
|
||||||
./core/default.nix
|
|
||||||
./core/system/vm-guest.nix
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
networking.hostName = "nomarchy-installer";
|
|
||||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
|
||||||
|
|
||||||
services.displayManager.autoLogin.enable = true;
|
|
||||||
services.displayManager.autoLogin.user = "nixos";
|
|
||||||
|
|
||||||
virtualisation.vmVariant.virtualisation.memorySize = 2048;
|
|
||||||
virtualisation.vmVariant.virtualisation.cores = 2;
|
|
||||||
|
|
||||||
home-manager.useGlobalPkgs = false;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.nixos = {
|
|
||||||
imports = [ ./features/default.nix ];
|
|
||||||
home.username = "nixos";
|
|
||||||
home.homeDirectory = "/home/nixos";
|
|
||||||
home.stateVersion = "25.11";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Ensure the user has the right groups for graphical environment
|
|
||||||
users.users.nixos = {
|
|
||||||
isNormalUser = true;
|
|
||||||
extraGroups = [ "wheel" "video" "networkmanager" "render" ];
|
|
||||||
initialPassword = "nixos";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
vm = nixpkgs.lib.nixosSystem {
|
default = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = { inherit inputs; };
|
||||||
modules = [
|
modules = [
|
||||||
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
||||||
|
|||||||
BIN
screenshot_2026-04-13_13-35-05.png
Normal file
BIN
screenshot_2026-04-13_13-35-05.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
Reference in New Issue
Block a user