nix: exorcise all with <expr>; uses

This commit is contained in:
Antoine Martin 2022-01-11 16:08:21 +01:00
parent ef59fd800e
commit 912073bee6
67 changed files with 576 additions and 259 deletions

View file

@ -1,23 +1,31 @@
{ config, lib, pkgs, ... }:
let
inherit (lib)
mkEnableOption
mkIf
;
cfg = config.my.displayManager.sddm;
in
{
options.my.displayManager.sddm.enable = lib.mkEnableOption "SDDM setup";
options.my.displayManager.sddm.enable = mkEnableOption "SDDM setup";
config = lib.mkIf cfg.enable {
config = mkIf cfg.enable {
services.xserver.displayManager.sddm = {
enable = true;
theme = "sugar-candy";
};
environment.systemPackages = with pkgs; [
packages.sddm-sugar-candy
environment.systemPackages = builtins.attrValues {
inherit (pkgs.packages)
sddm-sugar-candy
;
# dependencies for sugar-candy theme
libsForQt5.qt5.qtgraphicaleffects
libsForQt5.qt5.qtquickcontrols2
libsForQt5.qt5.qtsvg
];
inherit (pkgs.libsForQt5.qt5)
qtgraphicaleffects
qtquickcontrols2
qtsvg
;
};
};
}

View file

@ -1,8 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit (lib)
concatStringsSep
literalExample
mapAttrs'
mkIf
mkOption
nameValuePair
;
cfg = config.my.wakeonwlan;
mkWowlanService = name: cfg:
@ -20,7 +27,7 @@ let
};
in
{
options.my.wakeonwlan = {
options.my.wakeonwlan = let inherit (lib) types; in {
interfaces = mkOption {
default = { };
description = "Wireless interfaces where you want to enable WoWLAN";