Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make core an unecessary profile and add to suites #229

Merged
merged 1 commit into from
Apr 7, 2021
Merged

make core an unecessary profile and add to suites #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/devos/mkHosts.nix
View file
Open in desktop
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 @@ -24,14 +23,15 @@ let
modules;
};

global = { config, ... }: {
global = { config, pkgs, ... }: {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;

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
View file
Open in desktop
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
View file
Open in desktop
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