updates and cleanup

This commit is contained in:
Julian Sutter 2025-11-03 09:25:36 -08:00
parent de62048229
commit e80cc15caf
6 changed files with 26 additions and 54 deletions

View file

@ -35,7 +35,6 @@
specialArgs = commonSpecialArgs;
modules = [
home-manager.nixosModules.home-manager
hyprland.nixosModules.default
] ++ hardware ++ modules;
};
@ -51,31 +50,14 @@
./desktop/virtualization.nix
];
# Hyprland desktop modules (for transition)
hyprlandDesktopModules = [
./systems/common.nix
./users/jsutter.nix
./desktop/hyprland.nix
./desktop/dev.nix
./desktop/office.nix
./desktop/gaming.nix
./desktop/media.nix
./desktop/virtualization.nix
];
in {
nixosConfigurations = {
framework = mkSystem {
hardware = [ nixos-hardware.nixosModules.framework-16-7040-amd ];
hardware = [ nixos-hardware.nixosModules.framework-13-ai-300-amd ];
modules = commonDesktopModules ++ [
./systems/framework.nix
];
};
framework-hyprland = mkSystem {
hardware = [ nixos-hardware.nixosModules.framework-16-7040-amd ];
modules = hyprlandDesktopModules ++ [
./systems/framework.nix
];
};
aurora = mkSystem {
modules = commonDesktopModules ++ [
./systems/aurora.nix
@ -92,14 +74,6 @@
./users/jsutter.nix
];
};
skip01 = mkSystem {
modules = [
./systems/common-headless.nix
./systems/skip01.nix
./users/jsutter.nix
./servers/common.nix
];
};
};
};
}