From 9b22c911707048a9b12da64bb69e82ef8d8f1cfb Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 5 Dec 2020 15:44:58 +0100 Subject: [PATCH] =?UTF-8?q?config.sbruder.gui=20=E2=86=92=20config.sbruder?= =?UTF-8?q?.gui.enable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- machines/nunotaba/configuration.nix | 2 +- machines/sayuri/configuration.nix | 2 +- modules/communication.nix | 2 +- modules/creative.nix | 2 +- modules/cups.nix | 2 +- modules/default.nix | 2 +- modules/fonts.nix | 2 +- modules/libvirt.nix | 2 +- modules/media.nix | 2 +- modules/network-manager.nix | 2 +- modules/office.nix | 2 +- modules/pulseaudio.nix | 2 +- modules/sway.nix | 2 +- modules/tools.nix | 2 +- modules/web.nix | 2 +- users/simon/default.nix | 4 ++-- users/simon/modules/alacritty.nix | 2 +- users/simon/modules/ankisyncd.nix | 2 +- users/simon/modules/gtk.nix | 2 +- users/simon/modules/mpv.nix | 2 +- users/simon/modules/sway.nix | 2 +- users/simon/modules/xcompose.nix | 2 +- users/simon/modules/xdg.nix | 2 +- users/simon/modules/zathura.nix | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/machines/nunotaba/configuration.nix b/machines/nunotaba/configuration.nix index 6e9e3a1..07c28f3 100644 --- a/machines/nunotaba/configuration.nix +++ b/machines/nunotaba/configuration.nix @@ -12,7 +12,7 @@ ]; sbruder = { - gui = true; + gui.enable = true; libvirt.enable = true; restic.enable = true; ssd.enable = true; diff --git a/machines/sayuri/configuration.nix b/machines/sayuri/configuration.nix index 40acac4..e8878e9 100644 --- a/machines/sayuri/configuration.nix +++ b/machines/sayuri/configuration.nix @@ -12,7 +12,7 @@ ]; sbruder = { - gui = true; + gui.enable = true; libvirt.enable = true; restic.enable = true; ssd.enable = true; diff --git a/modules/communication.nix b/modules/communication.nix index 4f70193..21404ad 100644 --- a/modules/communication.nix +++ b/modules/communication.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { environment.systemPackages = with pkgs; [ (mumble.override { pulseSupport = true; }) # VoIP group chat claws-mail # email client that looks ugly but just works diff --git a/modules/creative.nix b/modules/creative.nix index 924ec1e..9c5c3d5 100644 --- a/modules/creative.nix +++ b/modules/creative.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { environment.systemPackages = with pkgs; [ blender # 3d animation darktable # photo development diff --git a/modules/cups.nix b/modules/cups.nix index 62891da..0277f2b 100644 --- a/modules/cups.nix +++ b/modules/cups.nix @@ -2,7 +2,7 @@ let gutenprintWithVersion = "gutenprint.${lib.versions.majorMinor (lib.getVersion pkgs.gutenprint)}"; in -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { services = { printing = { enable = true; diff --git a/modules/default.nix b/modules/default.nix index e80697c..5dff8ff 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,7 +3,7 @@ { # Options that affect multiple modules options.sbruder = { - gui = lib.mkEnableOption "gui"; + gui.enable = lib.mkEnableOption "gui"; }; # All modules are imported but non-essential modules are activated by diff --git a/modules/fonts.nix b/modules/fonts.nix index 5ac5482..00b2004 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { fonts = { fonts = with pkgs; [ corefonts # good ol’ microsoft fonts diff --git a/modules/libvirt.nix b/modules/libvirt.nix index d92a1e0..74080e5 100644 --- a/modules/libvirt.nix +++ b/modules/libvirt.nix @@ -6,6 +6,6 @@ config = { virtualisation.libvirtd.enable = config.sbruder.libvirt.enable; - environment.systemPackages = lib.mkIf config.sbruder.gui [ pkgs.virt-manager ]; + environment.systemPackages = lib.mkIf config.sbruder.gui.enable [ pkgs.virt-manager ]; }; } diff --git a/modules/media.nix b/modules/media.nix index 28b52ee..16c44b1 100644 --- a/modules/media.nix +++ b/modules/media.nix @@ -24,7 +24,7 @@ # Literature mupdf # document (pdf) viewer and tools ] ++ ( - if config.sbruder.gui then [ + if config.sbruder.gui.enable then [ # Audio audacity # audio editor picard # musicbrainz tagger diff --git a/modules/network-manager.nix b/modules/network-manager.nix index da43136..7cc872a 100644 --- a/modules/network-manager.nix +++ b/modules/network-manager.nix @@ -1,6 +1,6 @@ { config, lib, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { networking.networkmanager = { enable = true; }; diff --git a/modules/office.nix b/modules/office.nix index fa1a3eb..d1e5164 100644 --- a/modules/office.nix +++ b/modules/office.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { environment.systemPackages = with pkgs; [ aspellDicts.de aspellDicts.en diff --git a/modules/pulseaudio.nix b/modules/pulseaudio.nix index a896d41..e4084e9 100644 --- a/modules/pulseaudio.nix +++ b/modules/pulseaudio.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { sound.enable = true; hardware.pulseaudio = { enable = true; diff --git a/modules/sway.nix b/modules/sway.nix index 2011268..ec1d309 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { programs.sway.enable = true; # actual configuration happens in home-manager services.logind.lidSwitchDocked = config.services.logind.lidSwitch; diff --git a/modules/tools.nix b/modules/tools.nix index 9d9a6dc..804568b 100644 --- a/modules/tools.nix +++ b/modules/tools.nix @@ -103,7 +103,7 @@ # nix tools niv # depdendency manager ] - (lib.mkIf config.sbruder.gui [ + (lib.mkIf config.sbruder.gui.enable [ anki # flashcard SRS filezilla # ftp client gparted # gui for parted diff --git a/modules/web.nix b/modules/web.nix index 8894fd9..7c673c3 100644 --- a/modules/web.nix +++ b/modules/web.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { environment.systemPackages = with pkgs; [ firefox-wayland # Buidling chromium from source on a potato laptop is not fun diff --git a/users/simon/default.nix b/users/simon/default.nix index eb621ac..e0b70da 100644 --- a/users/simon/default.nix +++ b/users/simon/default.nix @@ -30,9 +30,9 @@ in home-manager.users.simon = { lib, pkgs, ... }: { options.sbruder = { - gui = lib.mkOption { + gui.enable = lib.mkOption { type = lib.types.bool; - default = config.sbruder.gui; + default = config.sbruder.gui.enable; description = "Whether to enable gui"; }; }; diff --git a/users/simon/modules/alacritty.nix b/users/simon/modules/alacritty.nix index 443ec4f..435999e 100644 --- a/users/simon/modules/alacritty.nix +++ b/users/simon/modules/alacritty.nix @@ -46,7 +46,7 @@ let in { programs.alacritty = { - enable = config.sbruder.gui; + enable = config.sbruder.gui.enable; settings = { font = { normal = { diff --git a/users/simon/modules/ankisyncd.nix b/users/simon/modules/ankisyncd.nix index 3576f1c..c9256ca 100644 --- a/users/simon/modules/ankisyncd.nix +++ b/users/simon/modules/ankisyncd.nix @@ -1,5 +1,5 @@ { config, lib, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { home.file.".local/share/Anki2/addons21/ankisyncd/__init__.py".source = ../files/ankisyncd/__init__.py; } diff --git a/users/simon/modules/gtk.nix b/users/simon/modules/gtk.nix index 61b85a2..1e86c60 100644 --- a/users/simon/modules/gtk.nix +++ b/users/simon/modules/gtk.nix @@ -2,7 +2,7 @@ { gtk = { - enable = config.sbruder.gui; + enable = config.sbruder.gui.enable; font.name = "sans-serif 10"; theme = { package = pkgs.gnome-themes-extra; diff --git a/users/simon/modules/mpv.nix b/users/simon/modules/mpv.nix index f25d05d..211211f 100644 --- a/users/simon/modules/mpv.nix +++ b/users/simon/modules/mpv.nix @@ -51,7 +51,7 @@ let in { programs.mpv = { - enable = config.sbruder.gui; + enable = config.sbruder.gui.enable; config = { # Main application font diff --git a/users/simon/modules/sway.nix b/users/simon/modules/sway.nix index 4694190..8b1678f 100644 --- a/users/simon/modules/sway.nix +++ b/users/simon/modules/sway.nix @@ -33,7 +33,7 @@ let cfg = config.wayland.windowManager.sway.config; thinsp = " "; in -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { wayland.windowManager.sway = { enable = true; diff --git a/users/simon/modules/xcompose.nix b/users/simon/modules/xcompose.nix index f59bb3e..cd6c764 100644 --- a/users/simon/modules/xcompose.nix +++ b/users/simon/modules/xcompose.nix @@ -1,6 +1,6 @@ { config, lib, ... }: -lib.mkIf config.sbruder.gui { +lib.mkIf config.sbruder.gui.enable { home.file.".XCompose".text = '' include "%L" diff --git a/users/simon/modules/xdg.nix b/users/simon/modules/xdg.nix index a1b381a..a57014d 100644 --- a/users/simon/modules/xdg.nix +++ b/users/simon/modules/xdg.nix @@ -2,7 +2,7 @@ { xdg.mimeApps = { - enable = config.sbruder.gui; + enable = config.sbruder.gui.enable; defaultApplications = { "application/pdf" = "org.pwmt.zathura.desktop"; "image/png" = "mpv.desktop"; diff --git a/users/simon/modules/zathura.nix b/users/simon/modules/zathura.nix index 5536e40..4a9e351 100644 --- a/users/simon/modules/zathura.nix +++ b/users/simon/modules/zathura.nix @@ -45,7 +45,7 @@ let in { programs.zathura = { - enable = config.sbruder.gui; + enable = config.sbruder.gui.enable; options = { selection-clipboard = "clipboard"; } // colorschemes.solarized-dark;