Unverified Commit 194a74c5 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

treewide/nixos: remove `with lib;` part 12 (#369419)

parents 7f8b06b0 b1227895

nixos/modules/services/x11/colord.nix

+2 −5
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
  pkgs,

  ...

}:



with lib;



let



  cfg = config.services.colord;
@@ -17,12 +14,12 @@ in 
  options = {



    services.colord = {

      enable = mkEnableOption "colord, the color management daemon";

      enable = lib.mkEnableOption "colord, the color management daemon";

    };



  };



  config = mkIf cfg.enable {

  config = lib.mkIf cfg.enable {



    environment.systemPackages = [ pkgs.colord ];

nixos/modules/services/x11/desktop-managers/cde.nix

+5 −8
Original line number Diff line number Diff line
@@ -4,19 +4,16 @@ 
  pkgs,

  ...

}:



with lib;



let

  xcfg = config.services.xserver;

  cfg = xcfg.desktopManager.cde;

in

{

  options.services.xserver.desktopManager.cde = {

    enable = mkEnableOption "Common Desktop Environment";

    enable = lib.mkEnableOption "Common Desktop Environment";



    extraPackages = mkOption {

      type = with types; listOf package;

    extraPackages = lib.mkOption {

      type = with lib.types; listOf package;

      default = with pkgs.xorg; [

        xclock

        bitmap
@@ -29,7 +26,7 @@ in 
        xwd

        xwud

      ];

      defaultText = literalExpression ''

      defaultText = lib.literalExpression ''

        with pkgs.xorg; [

          xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud

        ]
@@ -40,7 +37,7 @@ in 
    };

  };



  config = mkIf (xcfg.enable && cfg.enable) {

  config = lib.mkIf (xcfg.enable && cfg.enable) {

    environment.systemPackages = cfg.extraPackages;



    services.rpcbind.enable = true;

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+43 −46
Original line number Diff line number Diff line 
{ config, lib, pkgs, utils, ... }:



with lib;



let



  cfg = config.services.xserver.desktopManager.cinnamon;
@@ -18,16 +15,16 @@ in 
{

  options = {

    services.cinnamon = {

      apps.enable = mkEnableOption "Cinnamon default applications";

      apps.enable = lib.mkEnableOption "Cinnamon default applications";

    };



    services.xserver.desktopManager.cinnamon = {

      enable = mkEnableOption "the cinnamon desktop manager";

      enable = lib.mkEnableOption "the cinnamon desktop manager";



      sessionPath = mkOption {

      sessionPath = lib.mkOption {

        default = [];

        type = types.listOf types.package;

        example = literalExpression "[ pkgs.gpaste ]";

        type = lib.types.listOf lib.types.package;

        example = lib.literalExpression "[ pkgs.gpaste ]";

        description = ''

          Additional list of packages to be added to the session search path.

          Useful for GSettings-conditional autostart.
@@ -36,53 +33,53 @@ in 
        '';

      };



      extraGSettingsOverrides = mkOption {

      extraGSettingsOverrides = lib.mkOption {

        default = "";

        type = types.lines;

        type = lib.types.lines;

        description = "Additional gsettings overrides.";

      };



      extraGSettingsOverridePackages = mkOption {

      extraGSettingsOverridePackages = lib.mkOption {

        default = [];

        type = types.listOf types.path;

        type = lib.types.listOf lib.types.path;

        description = "List of packages for which gsettings are overridden.";

      };

    };



    environment.cinnamon.excludePackages = mkOption {

    environment.cinnamon.excludePackages = lib.mkOption {

      default = [];

      example = literalExpression "[ pkgs.blueman ]";

      type = types.listOf types.package;

      example = lib.literalExpression "[ pkgs.blueman ]";

      type = lib.types.listOf lib.types.package;

      description = "Which packages cinnamon should exclude from the default environment";

    };



  };



  config = mkMerge [

    (mkIf cfg.enable {

  config = lib.mkMerge [

    (lib.mkIf cfg.enable {

      services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];



      services.xserver.displayManager.lightdm.greeters.slick = {

        enable = mkDefault true;

        enable = lib.mkDefault true;



        # Taken from mint-artwork.gschema.override

        theme = mkIf (notExcluded pkgs.mint-themes) {

          name = mkDefault "Mint-Y-Aqua";

          package = mkDefault pkgs.mint-themes;

        theme = lib.mkIf (notExcluded pkgs.mint-themes) {

          name = lib.mkDefault "Mint-Y-Aqua";

          package = lib.mkDefault pkgs.mint-themes;

        };

        iconTheme = mkIf (notExcluded pkgs.mint-y-icons) {

          name = mkDefault "Mint-Y-Sand";

          package = mkDefault pkgs.mint-y-icons;

        iconTheme = lib.mkIf (notExcluded pkgs.mint-y-icons) {

          name = lib.mkDefault "Mint-Y-Sand";

          package = lib.mkDefault pkgs.mint-y-icons;

        };

        cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) {

          name = mkDefault "Bibata-Modern-Classic";

          package = mkDefault pkgs.mint-cursor-themes;

        cursorTheme = lib.mkIf (notExcluded pkgs.mint-cursor-themes) {

          name = lib.mkDefault "Bibata-Modern-Classic";

          package = lib.mkDefault pkgs.mint-cursor-themes;

        };

      };



      # Have to take care of GDM + Cinnamon on Wayland users

      environment.extraInit = ''

        ${concatMapStrings (p: ''

        ${lib.concatMapStrings (p: ''

          if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then

            export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}

          fi
@@ -95,30 +92,30 @@ in 
      '';



      # Default services

      services.blueman.enable = mkDefault (notExcluded pkgs.blueman);

      hardware.bluetooth.enable = mkDefault true;

      services.blueman.enable = lib.mkDefault (notExcluded pkgs.blueman);

      hardware.bluetooth.enable = lib.mkDefault true;

      security.polkit.enable = true;

      services.accounts-daemon.enable = true;

      services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));

      services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));

      services.dbus.packages = with pkgs; [

        cinnamon-common

        cinnamon-screensaver

        nemo-with-extensions

        xapp

      ];

      services.cinnamon.apps.enable = mkDefault true;

      services.cinnamon.apps.enable = lib.mkDefault true;

      services.gnome.evolution-data-server.enable = true;

      services.gnome.glib-networking.enable = true;

      services.gnome.gnome-keyring.enable = true;

      services.gvfs.enable = true;

      services.power-profiles-daemon.enable = mkDefault true;

      services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper

      services.touchegg.enable = mkDefault true;

      services.power-profiles-daemon.enable = lib.mkDefault true;

      services.switcherooControl.enable = lib.mkDefault true; # xapp-gpu-offload-helper

      services.touchegg.enable = lib.mkDefault true;

      services.udisks2.enable = true;

      services.upower.enable = mkDefault config.powerManagement.enable;

      services.libinput.enable = mkDefault true;

      services.upower.enable = lib.mkDefault config.powerManagement.enable;

      services.libinput.enable = lib.mkDefault true;

      services.xserver.updateDbusEnvironment = true;

      networking.networkmanager.enable = mkDefault true;

      networking.networkmanager.enable = lib.mkDefault true;



      # Enable colord server

      services.colord.enable = true;
@@ -204,9 +201,9 @@ in 
        pkgs.xdg-desktop-portal-gtk

      ];



      services.orca.enable = mkDefault (notExcluded pkgs.orca);

      services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);



      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];

      xdg.portal.configPackages = lib.mkDefault [ pkgs.cinnamon-common ];



      # Override GSettings schemas

      environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
@@ -217,8 +214,8 @@ in 
      ];



      # Shell integration for VTE terminals

      programs.bash.vteIntegration = mkDefault true;

      programs.zsh.vteIntegration = mkDefault true;

      programs.bash.vteIntegration = lib.mkDefault true;

      programs.zsh.vteIntegration = lib.mkDefault true;



      # Default Fonts

      fonts.packages = with pkgs; [
@@ -227,10 +224,10 @@ in 
      ];

    })



    (mkIf serviceCfg.apps.enable {

      programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility);

      programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);

      programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);

    (lib.mkIf serviceCfg.apps.enable {

      programs.gnome-disks.enable = lib.mkDefault (notExcluded pkgs.gnome-disk-utility);

      programs.gnome-terminal.enable = lib.mkDefault (notExcluded pkgs.gnome-terminal);

      programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller);



      environment.systemPackages = with pkgs; utils.removePackagesByName [

        # cinnamon team apps

nixos/modules/services/x11/desktop-managers/deepin.nix

+27 −30
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
  utils,

  ...

}:



with lib;



let

  xcfg = config.services.xserver;

  cfg = xcfg.desktopManager.deepin;
@@ -21,68 +18,68 @@ in 
  options = {



    services.xserver.desktopManager.deepin = {

      enable = mkEnableOption "Deepin desktop manager";

      extraGSettingsOverrides = mkOption {

      enable = lib.mkEnableOption "Deepin desktop manager";

      extraGSettingsOverrides = lib.mkOption {

        default = "";

        type = types.lines;

        type = lib.types.lines;

        description = "Additional gsettings overrides.";

      };

      extraGSettingsOverridePackages = mkOption {

      extraGSettingsOverridePackages = lib.mkOption {

        default = [ ];

        type = types.listOf types.path;

        type = lib.types.listOf lib.types.path;

        description = "List of packages for which gsettings are overridden.";

      };

    };



    environment.deepin.excludePackages = mkOption {

    environment.deepin.excludePackages = lib.mkOption {

      default = [ ];

      type = types.listOf types.package;

      type = lib.types.listOf lib.types.package;

      description = "List of default packages to exclude from the configuration";

    };



  };



  config = mkIf cfg.enable {

  config = lib.mkIf cfg.enable {

    services.displayManager.sessionPackages = [ pkgs.deepin.dde-session ];

    services.displayManager.defaultSession = mkDefault "dde-x11";

    services.displayManager.defaultSession = lib.mkDefault "dde-x11";



    # Update the DBus activation environment after launching the desktop manager.

    services.xserver.displayManager.sessionCommands = ''

      ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all

    '';



    hardware.bluetooth.enable = mkDefault true;

    hardware.bluetooth.enable = lib.mkDefault true;

    security.polkit.enable = true;



    services.deepin.dde-daemon.enable = mkForce true;

    services.deepin.dde-api.enable = mkForce true;

    services.deepin.app-services.enable = mkForce true;

    services.deepin.dde-daemon.enable = lib.mkForce true;

    services.deepin.dde-api.enable = lib.mkForce true;

    services.deepin.app-services.enable = lib.mkForce true;



    services.colord.enable = mkDefault true;

    services.accounts-daemon.enable = mkDefault true;

    services.gvfs.enable = mkDefault true;

    services.gnome.glib-networking.enable = mkDefault true;

    services.gnome.gnome-keyring.enable = mkDefault true;

    services.bamf.enable = mkDefault true;

    services.colord.enable = lib.mkDefault true;

    services.accounts-daemon.enable = lib.mkDefault true;

    services.gvfs.enable = lib.mkDefault true;

    services.gnome.glib-networking.enable = lib.mkDefault true;

    services.gnome.gnome-keyring.enable = lib.mkDefault true;

    services.bamf.enable = lib.mkDefault true;



    services.libinput.enable = mkDefault true;

    services.libinput.enable = lib.mkDefault true;

    services.udisks2.enable = true;

    services.upower.enable = mkDefault config.powerManagement.enable;

    networking.networkmanager.enable = mkDefault true;

    programs.dconf.enable = mkDefault true;

    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;

    services.upower.enable = lib.mkDefault config.powerManagement.enable;

    networking.networkmanager.enable = lib.mkDefault true;

    programs.dconf.enable = lib.mkDefault true;

    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt;



    fonts.packages = with pkgs; [ noto-fonts ];

    xdg.mime.enable = true;

    xdg.menus.enable = true;

    xdg.icons.enable = true;

    xdg.portal.enable = mkDefault true;

    xdg.portal.extraPortals = mkDefault [

    xdg.portal.enable = lib.mkDefault true;

    xdg.portal.extraPortals = lib.mkDefault [

      pkgs.xdg-desktop-portal-gtk

    ];



    # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259

    xdg.portal.config.deepin.default = mkDefault [ "gtk" ];

    xdg.portal.config.deepin.default = lib.mkDefault [ "gtk" ];



    environment.sessionVariables = {

      NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

nixos/modules/services/x11/desktop-managers/enlightenment.nix

+6 −9
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
  lib,

  ...

}:



with lib;



let



  e = pkgs.enlightenment;
@@ -23,11 +20,11 @@ in 


{

  meta = {

    maintainers = teams.enlightenment.members;

    maintainers = lib.teams.enlightenment.members;

  };



  imports = [

    (mkRenamedOptionModule

    (lib.mkRenamedOptionModule

      [ "services" "xserver" "desktopManager" "e19" "enable" ]

      [ "services" "xserver" "desktopManager" "enlightenment" "enable" ]

    )
@@ -35,15 +32,15 @@ in 


  options = {



    services.xserver.desktopManager.enlightenment.enable = mkOption {

      type = types.bool;

    services.xserver.desktopManager.enlightenment.enable = lib.mkOption {

      type = lib.types.bool;

      default = false;

      description = "Enable the Enlightenment desktop environment.";

    };



  };



  config = mkIf cfg.enable {

  config = lib.mkIf cfg.enable {



    environment.systemPackages = with pkgs; [

      enlightenment.econnman
@@ -105,7 +102,7 @@ in 


    services.udisks2.enable = true;

    services.upower.enable = config.powerManagement.enable;

    services.libinput.enable = mkDefault true;

    services.libinput.enable = lib.mkDefault true;



    services.dbus.packages = [ e.efl ];