james
/
nil
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

de-pluralized systems -> system 

This was not being used consistently.
This commit is contained in:
James Patrick 2022-07-16 19:07:34 -04:00
parent 190f561fd6
commit 4e9b865e33
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/nil.nix
View File

@ -34,7 +34,7 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
this.systems = {
this.system = {
zfs.enable = true;
yubikey.enable = true;
};

3
modules/profiles/laptop.nix
View File

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }: {
imports = [ ./graphical.nix ];
this.systems.boot.enable = true;
this.system.boot.enable = true;
networking.networkmanager.enable = true;
users.users.james.extraGroups = [ "networkmanager" ];
}

4
modules/system/boot.nix
View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let cfg = config.this.systems.boot;
let cfg = config.this.system.boot;
in with lib; {
options.this.systems.boot.enable = mkOption {
options.this.system.boot.enable = mkOption {
default = true;
type = with types; bool;
description = "Is there a physical power button?";

4
modules/system/displaymanager.nix
View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }:
let
cfg = config.systems.displaymanager;
cfg = config.system.displaymanager;
graphical = config.this.graphical;
in with lib; {
options = {
systems.displaymanager.enable = mkOption {
system.displaymanager.enable = mkOption {
default = graphical.enable;
type = with types; bool;
};

4
modules/system/flatpak.nix
View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }:
let
cfg = config.systems.flatpak;
cfg = config.system.flatpak;
graphical = config.this.graphical;
in with lib; {
options = {
systems.flatpak.enable = mkOption {
system.flatpak.enable = mkOption {
default = graphical.enable;
type = with types; bool;
};

4
modules/system/yubikey.nix
View File

@ -1,9 +1,9 @@
{ config, lib, pkgs, ... }:
let
cfg = config.this.systems.yubikey;
cfg = config.this.system.yubikey;
graphical = config.this.graphical;
in with lib; {
options.this.systems.yubikey.enable = mkEnableOption "Yubikey";
options.this.system.yubikey.enable = mkEnableOption "Yubikey";
config = mkIf cfg.enable {
services.udev.packages = with pkgs; [ yubikey-personalization ];

4
modules/system/zfs.nix
View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let cfg = config.this.systems.zfs;
let cfg = config.this.system.zfs;
in with lib; {
options.this.systems.zfs.enable = mkEnableOption "zfs";
options.this.system.zfs.enable = mkEnableOption "zfs";
config = mkIf cfg.enable {
boot = {