From 4a8095f2717de3830256dbb9a425cfa435ed644a Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 29 Apr 2024 22:51:57 +1200 Subject: [PATCH] refactor(systemModules:services): enable if host.type != phone --- system/modules/services/default.nix | 2 ++ system/modules/services/gnome/default.nix | 18 ++++++++++++++++++ system/modules/services/gvfs/default.nix | 12 ++++++++++++ .../services/system76Scheduler/default.nix | 10 +++------- 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 system/modules/services/gnome/default.nix create mode 100644 system/modules/services/gvfs/default.nix diff --git a/system/modules/services/default.nix b/system/modules/services/default.nix index 6824e1e..888560c 100644 --- a/system/modules/services/default.nix +++ b/system/modules/services/default.nix @@ -6,6 +6,8 @@ ./system76Scheduler ./dbus ./kdeconnect + ./gnome + ./gvfs ]; options.systemModules.services = { diff --git a/system/modules/services/gnome/default.nix b/system/modules/services/gnome/default.nix new file mode 100644 index 0000000..f3157fe --- /dev/null +++ b/system/modules/services/gnome/default.nix @@ -0,0 +1,18 @@ +{ lib, config, pkgs, ... }: + +let + inherit (lib) mkIf; + host = config.systemModules.host; +in + +{ + config = mkIf (host.type != "phone" && host.type != "server") { + services = { + gnome = { + glib-networking.enable = true; + gnome-keyring.enable = true; + }; + udev.packages = [ pkgs.gnome.gnome-settings-daemon ]; + }; + }; +} diff --git a/system/modules/services/gvfs/default.nix b/system/modules/services/gvfs/default.nix new file mode 100644 index 0000000..60530e6 --- /dev/null +++ b/system/modules/services/gvfs/default.nix @@ -0,0 +1,12 @@ +{ lib, config, ... }: + +let + inherit (lib) mkIf; + host = config.systemModules.host; +in + +{ + config = mkIf ( host.type != "phone") { + services.gvfs = true; + }; +} diff --git a/system/modules/services/system76Scheduler/default.nix b/system/modules/services/system76Scheduler/default.nix index 3ab5e69..97a880b 100644 --- a/system/modules/services/system76Scheduler/default.nix +++ b/system/modules/services/system76Scheduler/default.nix @@ -1,16 +1,12 @@ { lib, config, ... }: let - cfg = config.systemModules.services.system76Scheduler; - inherit (lib) mkEnableOption mkIf; + inherit (lib) mkIf; + host = config.systemModules.host; in { - options.systemModules.services.system76Scheduler = { - enable = mkEnableOption "Enable system 76 scheduler module"; - }; - - config = mkIf cfg.enable { + config = mkIf (host.type != "phone") { services.system76-scheduler = { enable = true;