Skip to content

Commit

Permalink
make core an unecessary profile and add to suites
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Pacman99 committed Apr 7, 2021
1 parent 01b0555 commit b648e20
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 3 additions & 1 deletion lib/devos/mkHosts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ let
];

modules = {
core = "${self}/profiles/core";
modOverrides = { config, overrideModulesPath, ... }:
let
inherit (overrides) modules disabledModules;
Expand All @@ -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;

Expand All @@ -49,6 +49,8 @@ let
override.flake = inputs.override;
};

nix.package = pkgs.nixFlakes;

nix.extraOptions = ''
experimental-features = ${lib.concatStringsSep " "
experimentalFeatures
Expand Down
3 changes: 0 additions & 3 deletions profiles/core/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
let inherit (lib) fileContents;
in
{
nix.package = pkgs.nixFlakes;

nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];

Expand Down Expand Up @@ -145,6 +144,4 @@ in

services.earlyoom.enable = true;

users.mutableUsers = false;

}
2 changes: 1 addition & 1 deletion suites/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down

0 comments on commit b648e20

Please sign in to comment.