From 81803c53723b939a15eaf01af178ecc4364a9549 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Thu, 9 Jun 2022 08:59:19 -0700 Subject: ref(laptop): move services related to laptop to host's configuration As for the bluetooth configuration, we don't need that level of indirection. The laptop can consume these services directly, and we can drop the profile for laptop. Change-Id: Ia434d336ae581bd040fbc4963e5856806183d55e Reviewed-on: https://cl.fcuny.net/c/world/+/290 Reviewed-by: Franck Cuny --- hosts/aptos/profile.nix | 2 -- hosts/aptos/services.nix | 6 ++++++ profiles/default.nix | 2 +- profiles/laptop/default.nix | 15 --------------- 4 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 profiles/laptop/default.nix diff --git a/hosts/aptos/profile.nix b/hosts/aptos/profile.nix index 1ba221e..58bb296 100644 --- a/hosts/aptos/profile.nix +++ b/hosts/aptos/profile.nix @@ -4,8 +4,6 @@ hardware.sane.enable = true; my.profiles = { - # Laptop specific configuration - laptop.enable = true; desktop.enable = true; multimedia.enable = true; trusted.enable = true; diff --git a/hosts/aptos/services.nix b/hosts/aptos/services.nix index a2210e2..5e98947 100644 --- a/hosts/aptos/services.nix +++ b/hosts/aptos/services.nix @@ -2,6 +2,12 @@ let secrets = config.age.secrets; in { my.services = { + # monitors and controls temperature + thermald.enable = true; + + # Enable TLP power management + tlp.enable = true; + backup = { enable = true; user = "fcuny"; diff --git a/profiles/default.nix b/profiles/default.nix index 9c0d2f9..df86fe6 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -1 +1 @@ -{ ... }: { imports = [ ./laptop ./gtk ./trusted ./wm ./desktop ./multimedia ]; } +{ ... }: { imports = [ ./gtk ./trusted ./wm ./desktop ./multimedia ]; } diff --git a/profiles/laptop/default.nix b/profiles/laptop/default.nix deleted file mode 100644 index f5288b6..0000000 --- a/profiles/laptop/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, ... }: -let cfg = config.my.profiles.laptop; -in { - options.my.profiles.laptop = with lib; { - enable = mkEnableOption "laptop profile"; - }; - - config = lib.mkIf cfg.enable { - # monitors and controls temperature - my.services.thermald.enable = true; - - # Enable TLP power management - my.services.tlp.enable = true; - }; -} -- cgit 1.4.1