dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge #229

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/devos/mkHosts.nix
View File

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

3
profiles/core/default.nix
View File

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

2
suites/default.nix
View File

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