Namespacing "this" for err globals?

This commit is contained in:
James Patrick 2021-12-15 00:27:39 -05:00
parent 5539a175f8
commit c4f5a3af82
9 changed files with 13 additions and 20 deletions

View File

@ -3,7 +3,7 @@
# - Language tools (grammer)
let
cfg = config.application.emacs;
graphical = config.graphical;
graphical = config.this.graphical;
in with lib; {
options = {
application.emacs = {

View File

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }:
let
cfg = config.application.firefox;
graphical = config.graphical;
graphical = config.this.graphical;
sway_cfg = config.applications.sway;
in with lib; {
options = {

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
cfg = config.application.nextcloud;
graphical = config.graphical;
graphical = config.this.graphical;
in with lib; {
options = {
application.nextcloud = {

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
cfg = config.application.sway;
graphical = config.graphical;
graphical = config.this.graphical;
in with lib; {
options = {
application.sway = {

View File

@ -1,12 +1,8 @@
{ config, pkgs, lib, ... }: {
options = {
graphical = {
enable = lib.mkOption {
default = false;
type = with lib.types; bool;
description = "Does this actually need X/Wayland";
};
};
options.this.graphical.enable = lib.mkOption {
default = false;
type = with lib.types; bool;
description = "Does this actually need X/Wayland";
};
imports = [

View File

@ -1,7 +1,4 @@
{ config, lib, pkgs, ... }:
let grpahical = config.graphical;
in {
{ config, lib, pkgs, ... }: {
imports = [
../applications/firefox.nix
../applications/nextcloud.nix
@ -10,7 +7,7 @@ in {
./minimal.nix
];
graphical.enable = true;
this.graphical.enable = true;
# Enable sound.
sound.enable = true;

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
cfg = config.systems.flatpak;
graphical = config.graphical;
graphical = config.this.graphical;
in with lib; {
options = {
systems.flatpak = {

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }:
let graphical = config.graphical;
let graphical = config.this.graphical;
in {
config = lib.mkIf graphical.enable {
fonts = {

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }:
let graphical = config.graphical;
let graphical = config.this.graphical;
in with lib; {
config = mkIf graphical.enable {
home-manager.users.james = {