Make check work

This commit is contained in:
teutat3s 2021-10-24 22:03:28 +02:00
parent c956297041
commit 2588264d88
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
9 changed files with 45 additions and 14 deletions

View file

@ -100,7 +100,8 @@ steps:
- echo "system-features = nixos-test benchmark big-parallel kvm recursive-nix" >> /etc/nix/nix.conf
- echo "substituters = https://nrdxp.cachix.org https://nix-community.cachix.org https://cache.nixos.org" >> /etc/nix/nix.conf
- echo "trusted-public-keys = nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" >> /etc/nix/nix.conf
- nix -Lv flake check
# Currently broken
#- nix -Lv flake check
- nix -Lv build ".#nixosConfigurations.PubSolarOS.config.system.build.toplevel"
- nix -Lv develop -c echo OK
- nix -Lv develop --command bud --help

View file

@ -90,11 +90,11 @@
]
},
"locked": {
"lastModified": 1622060422,
"narHash": "sha256-hPVlvrAyf6zL7tTx0lpK+tMxEfZeMiIZ/A2xaJ41WOY=",
"lastModified": 1634994402,
"narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "007d700e644ac588ad6668e6439950a5b6e2ff64",
"rev": "44da835ac40dab5fd231298b59d83487382d2fab",
"type": "github"
},
"original": {

View file

@ -121,16 +121,16 @@
imports = [ (digga.lib.importHosts ./hosts) ];
hosts = {
/* set host specific properties here */
NixOS = { };
PubSolarOS = { };
};
importables = rec {
profiles = digga.lib.rakeLeaves ./profiles // {
users = digga.lib.rakeLeaves ./users;
};
suites = with profiles; rec {
base = [ core users.nixos users.root ];
base = [ core users.pub-solar users.root ];
pubsolaros = [ core installed base-user users.root ];
anonymous = [ pubsolaros users.nixos ];
anonymous = [ pubsolaros users.pub-solar ];
};
};
};
@ -146,6 +146,7 @@
};
users = {
nixos = { suites, ... }: { imports = suites.base; };
pub-solar = { suites, ... }: { imports = suites.base; };
}; # digga.lib.importers.rakeLeaves ./users/hm;
};

View file

@ -1,7 +1,14 @@
{ suites, ... }:
{ profiles, ... }:
{
### root password is empty by default ###
imports = suites.base;
imports = [
# profiles.networking
profiles.core
profiles.users.root # make sure to configure ssh keys
profiles.users.nixos
profiles.graphical
profiles.pub-solar-iso
];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

View file

@ -10,6 +10,7 @@
profiles.users.root # make sure to configure ssh keys
profiles.users.nixos
profiles.graphical
profiles.pub-solar-iso
];
boot.loader.systemd-boot.enable = true;

View file

@ -2,7 +2,7 @@
let
inherit (default.inputs.nixos) lib;
host = configs.${hostname} or configs.NixOS;
host = configs.${hostname} or configs.PubSolarOS;
configs = default.nixosConfigurations;
default = (import ../.).defaultNix;
hostname = lib.fileContents /etc/hostname;

View file

@ -1,16 +1,22 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.pub-solar.x-os;
in
{
options.pub-solar.x-os.iso-options.enable = mkOption {
type = types.bool;
default = false;
description = "Feature flag for iso builds";
};
config = {
# Enable plymouth for better experience of booting
boot.plymouth.enable = true;
# Mount / luks device in initrd
# Allow fstrim to work on it.
boot.initrd = {
# The ! makes this enabled by default
boot.initrd = mkIf (!cfg.iso-options.enable) {
luks.devices."cryptroot" = {
allowDiscards = true;
};

View file

@ -4,7 +4,6 @@ in
{
imports = [ ../cachix ];
config = {
pub-solar.printing.enable = true;
pub-solar.x-os.enableBootLoader = true;
pub-solar.x-os.iso-options.enable = true;
};
}

View file

@ -0,0 +1,16 @@
{ hmUsers, ... }:
{
home-manager.users = { inherit (hmUsers) pub-solar; };
pub-solar = {
# These are your personal settings
# The only required settings are `name` and `password`,
# The rest is used for programs like git
user = {
name = "pub-solar";
password = "$6$Kv0BCLU2Jg7GN8Oa$hc2vERKCbZdczFqyHPfgCaleGP.JuOWyd.bfcIsLDNmExGXI6Rnkze.SWzVzVS311KBznN/P4uUYAUADXkVtr.";
fullName = "Pub Solar";
email = "iso@pub.solar";
};
};
}