229: make core an unecessary profile and add to suites r=nrdxp a=Pacman99

Prevents mkHosts subverting standard devos api to import core and add
all necessary core features to mkHosts, so core can be safely deleted in
suites

Co-authored-by: Pacman99 <pachum99@gmail.com>
This commit is contained in:
bors[bot] 2021-04-07 02:04:27 +00:00 committed by GitHub
commit 306e7c1967
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions

View file

@ -12,7 +12,6 @@ let
];
modules = {
core = "${self}/profiles/core";
modOverrides = { config, overrideModulesPath, ... }:
let
inherit (overrides) modules disabledModules;
@ -24,7 +23,7 @@ let
modules;
};
global = { config, ... }: {
global = { config, pkgs, ... }: {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
@ -32,6 +31,7 @@ let
extraSpecialArgs = extern.userSpecialArgs // { suites = suites.user; };
sharedModules = extern.userModules ++ (builtins.attrValues self.homeModules);
};
users.mutableUsers = lib.mkDefault false;
hardware.enableRedistributableFirmware = lib.mkDefault true;
@ -49,6 +49,8 @@ let
override.flake = inputs.override;
};
nix.package = pkgs.nixFlakes;
nix.extraOptions = ''
experimental-features = ${lib.concatStringsSep " "
experimentalFeatures

View file

@ -2,7 +2,6 @@
let inherit (lib) fileContents;
in
{
nix.package = pkgs.nixFlakes;
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
@ -145,6 +144,4 @@ in
services.earlyoom.enable = true;
users.mutableUsers = false;
}

View file

@ -2,7 +2,7 @@
{
system = with profiles; rec {
base = [ users.nixos users.root ];
base = [ core users.nixos users.root ];
};
user = with userProfiles; rec {
base = [ direnv git ];