Namespacing "this" for err globals?
This commit is contained in:
parent
5539a175f8
commit
c4f5a3af82
|
@ -3,7 +3,7 @@
|
||||||
# - Language tools (grammer)
|
# - Language tools (grammer)
|
||||||
let
|
let
|
||||||
cfg = config.application.emacs;
|
cfg = config.application.emacs;
|
||||||
graphical = config.graphical;
|
graphical = config.this.graphical;
|
||||||
in with lib; {
|
in with lib; {
|
||||||
options = {
|
options = {
|
||||||
application.emacs = {
|
application.emacs = {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.application.firefox;
|
cfg = config.application.firefox;
|
||||||
graphical = config.graphical;
|
graphical = config.this.graphical;
|
||||||
sway_cfg = config.applications.sway;
|
sway_cfg = config.applications.sway;
|
||||||
in with lib; {
|
in with lib; {
|
||||||
options = {
|
options = {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.application.nextcloud;
|
cfg = config.application.nextcloud;
|
||||||
graphical = config.graphical;
|
graphical = config.this.graphical;
|
||||||
in with lib; {
|
in with lib; {
|
||||||
options = {
|
options = {
|
||||||
application.nextcloud = {
|
application.nextcloud = {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.application.sway;
|
cfg = config.application.sway;
|
||||||
graphical = config.graphical;
|
graphical = config.this.graphical;
|
||||||
in with lib; {
|
in with lib; {
|
||||||
options = {
|
options = {
|
||||||
application.sway = {
|
application.sway = {
|
||||||
|
|
|
@ -1,12 +1,8 @@
|
||||||
{ config, pkgs, lib, ... }: {
|
{ config, pkgs, lib, ... }: {
|
||||||
options = {
|
options.this.graphical.enable = lib.mkOption {
|
||||||
graphical = {
|
default = false;
|
||||||
enable = lib.mkOption {
|
type = with lib.types; bool;
|
||||||
default = false;
|
description = "Does this actually need X/Wayland";
|
||||||
type = with lib.types; bool;
|
|
||||||
description = "Does this actually need X/Wayland";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }: {
|
||||||
|
|
||||||
let grpahical = config.graphical;
|
|
||||||
in {
|
|
||||||
imports = [
|
imports = [
|
||||||
../applications/firefox.nix
|
../applications/firefox.nix
|
||||||
../applications/nextcloud.nix
|
../applications/nextcloud.nix
|
||||||
|
@ -10,7 +7,7 @@ in {
|
||||||
./minimal.nix
|
./minimal.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
graphical.enable = true;
|
this.graphical.enable = true;
|
||||||
|
|
||||||
# Enable sound.
|
# Enable sound.
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.systems.flatpak;
|
cfg = config.systems.flatpak;
|
||||||
graphical = config.graphical;
|
graphical = config.this.graphical;
|
||||||
in with lib; {
|
in with lib; {
|
||||||
options = {
|
options = {
|
||||||
systems.flatpak = {
|
systems.flatpak = {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let graphical = config.graphical;
|
let graphical = config.this.graphical;
|
||||||
in {
|
in {
|
||||||
config = lib.mkIf graphical.enable {
|
config = lib.mkIf graphical.enable {
|
||||||
fonts = {
|
fonts = {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let graphical = config.graphical;
|
let graphical = config.this.graphical;
|
||||||
in with lib; {
|
in with lib; {
|
||||||
config = mkIf graphical.enable {
|
config = mkIf graphical.enable {
|
||||||
home-manager.users.james = {
|
home-manager.users.james = {
|
||||||
|
|
Reference in New Issue
Block a user