Merge branch 'main' into fix/set-nix-dram-default

This commit is contained in:
teutat3s 2022-08-14 15:54:51 +02:00
commit 5dd0a5badb
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
2 changed files with 10 additions and 8 deletions

View file

@ -6,7 +6,6 @@
# interface that has the local link to the target machine
imports = [
# profiles.networking
profiles.core
profiles.users.root # make sure to configure ssh keys
profiles.users.pub-solar
profiles.base-user

View file

@ -1,4 +1,4 @@
{ lib, ... }:
{ config, lib, ... }:
with lib;
let
@ -10,18 +10,12 @@ in
./boot.nix
./fonts.nix
./i18n.nix
./modules.nix
./networking.nix
./nix.nix
./packages.nix
./services.nix
];
pub-solar.terminal-life.enable = true;
pub-solar.audio.enable = lib.mkIf (!cfg.lite) true;
pub-solar.crypto.enable = lib.mkIf (!cfg.lite) true;
pub-solar.devops.enable = lib.mkIf (!cfg.lite) true;
options.pub-solar.core = {
lite = mkOption {
description = ''
@ -31,4 +25,13 @@ in
type = types.bool;
};
};
config = {
pub-solar = {
terminal-life.enable = true;
audio.enable = lib.mkIf (!cfg.lite) true;
crypto.enable = lib.mkIf (!cfg.lite) true;
devops.enable = lib.mkIf (!cfg.lite) true;
};
};
}