feat: implement modular foundation and core system services
- Update flake.nix with 25.11 release and core inputs - Add dedicated modules for audio (Pipewire), bluetooth, and networking - Update GEMINI.md with the new Modular Merging Architecture blueprint - Configure graphical installer ISO and test VM outputs
This commit is contained in:
73
flake.nix
73
flake.nix
@@ -2,16 +2,18 @@
|
||||
description = "Nomarchy - A NixOS-based distribution with Omarchy flavour";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
|
||||
disko = {
|
||||
url = "github:nix-community/disko";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
@@ -20,7 +22,7 @@
|
||||
walker.url = "github:abenz1267/walker";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixos-hardware, disko, home-manager, nix-colors, stylix, walker, ... } @ inputs: {
|
||||
outputs = { self, nixpkgs, nixos-hardware, disko, impermanence, home-manager, nix-colors, stylix, walker, ... } @ inputs: {
|
||||
nixosModules = {
|
||||
system = import ./modules/system;
|
||||
home = import ./modules/home;
|
||||
@@ -28,67 +30,86 @@
|
||||
|
||||
nixosConfigurations = {
|
||||
installerIso = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
|
||||
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
||||
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix"
|
||||
./hosts/live-iso.nix
|
||||
./modules/system
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
system.stateVersion = "24.11";
|
||||
system.stateVersion = "25.11";
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
|
||||
services.displayManager.autoLogin.enable = true;
|
||||
services.displayManager.autoLogin.user = "nixos";
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.nixos = {
|
||||
imports = [ ./modules/home ];
|
||||
home.username = "nixos";
|
||||
home.homeDirectory = "/home/nixos";
|
||||
home.stateVersion = "25.11";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
installerVm = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
||||
./hosts/live-iso.nix
|
||||
./modules/system
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
system.stateVersion = "24.11";
|
||||
system.stateVersion = "25.11";
|
||||
networking.hostName = "nomarchy-installer";
|
||||
|
||||
# VM specific settings to start in terminal
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
|
||||
services.displayManager.autoLogin.enable = true;
|
||||
services.displayManager.autoLogin.user = "nixos";
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.nixos = {
|
||||
imports = [ ./modules/home ];
|
||||
home.username = "nixos";
|
||||
home.homeDirectory = "/home/nixos";
|
||||
home.stateVersion = "25.11";
|
||||
};
|
||||
|
||||
# VM specific settings to enable graphical boot
|
||||
virtualisation.vmVariant = {
|
||||
virtualisation.memorySize = 2048;
|
||||
virtualisation.cores = 2;
|
||||
virtualisation.graphics = true;
|
||||
};
|
||||
|
||||
# Use a dummy hardware config
|
||||
# Use a dummy hardware config for VM
|
||||
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
|
||||
boot.loader.grub.device = "/dev/vda";
|
||||
|
||||
# Setup a user that automatically logs in to console
|
||||
# Ensure the user has the right groups for graphical environment
|
||||
users.users.nixos = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "video" ];
|
||||
extraGroups = [ "wheel" "video" "networkmanager" ];
|
||||
initialPassword = "nixos";
|
||||
};
|
||||
|
||||
services.getty.autologinUser = "nixos";
|
||||
|
||||
# Optionally, start the installer immediately
|
||||
environment.interactiveShellInit = ''
|
||||
if [[ "$(tty)" == "/dev/tty1" ]]; then
|
||||
echo "Welcome to the Nomarchy Installer Test VM!"
|
||||
echo "To start the installer, run: sudo /etc/install-nomarchy.sh"
|
||||
fi
|
||||
'';
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
vm = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
||||
./modules/system
|
||||
./modules/system/hardware.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
system.stateVersion = "24.11";
|
||||
system.stateVersion = "25.11";
|
||||
networking.hostName = "nomarchy";
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
# VM specific settings
|
||||
@@ -118,7 +139,7 @@
|
||||
imports = [ ./modules/home ];
|
||||
home.username = "nomarchy";
|
||||
home.homeDirectory = "/home/nomarchy";
|
||||
home.stateVersion = "24.11";
|
||||
home.stateVersion = "25.11";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user