From ab0cca019bd574b396cf2ccc9ca6a5531bd87856 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Fri, 1 Jul 2022 10:06:37 -0700 Subject: feat(wpcarro/nixos): Support laptop.nix module Define shared laptop configuration. The primary impetus of this change was `powerManagement.powertop`. Change-Id: Icbd04a252005ab391dc8f7d5ebf0968af91f2e0c Reviewed-on: https://cl.tvl.fyi/c/depot/+/5910 Tested-by: BuildkiteCI Reviewed-by: wpcarro Autosubmit: wpcarro --- users/wpcarro/nixos/marcus/default.nix | 7 ++++--- users/wpcarro/nixos/modules/laptop.nix | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 users/wpcarro/nixos/modules/laptop.nix diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix index 0dc4fc57f5..db3472926a 100644 --- a/users/wpcarro/nixos/marcus/default.nix +++ b/users/wpcarro/nixos/marcus/default.nix @@ -4,6 +4,8 @@ let inherit (depot.users) wpcarro; + usermod = name: depot.path.origSrc + ("/users/wpcarro/nixos/modules/${name}"); + wpcarrosEmacs = wpcarro.emacs.nixos { load = [ ./marcus.el ]; }; @@ -18,6 +20,7 @@ in imports = [ (depot.path.origSrc + "/users/wpcarro/nixos/marcus/hardware.nix") (pkgs.home-manager.src + "/nixos") + (usermod "laptop.nix") ]; # Use the TVL binary cache @@ -111,9 +114,7 @@ in }; }; - programs = wpcarro.common.programs // { - light.enable = true; - }; + programs = wpcarro.common.programs; environment.variables = { EDITOR = "emacsclient"; diff --git a/users/wpcarro/nixos/modules/laptop.nix b/users/wpcarro/nixos/modules/laptop.nix new file mode 100644 index 0000000000..03dd0f39bb --- /dev/null +++ b/users/wpcarro/nixos/modules/laptop.nix @@ -0,0 +1,15 @@ +# Laptop-specific NixOS configuration. +_: + +{ + # Automatically detect location for redshift. + services.geoclue2.enable = true; + location.provider = "geoclue2"; + + # Enable power-saving features. + powerManagement.powertop.enable = true; + + # Backlight control command. + programs.light.enable = true; +} + -- cgit 1.4.1