From 177f1887d4d4eb347c6a8328fbd8ca0f346887bc Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 5 May 2022 23:21:14 +0100 Subject: [PATCH] compton: remove This module was deprecated since release 20.03 according to the news, so it can be removed. --- docs/release-notes/rl-2211.adoc | 3 +++ modules/modules.nix | 1 - modules/services/compton.nix | 43 --------------------------------- 3 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 modules/services/compton.nix diff --git a/docs/release-notes/rl-2211.adoc b/docs/release-notes/rl-2211.adoc index d972e8d55..ed2fa55ce 100644 --- a/docs/release-notes/rl-2211.adoc +++ b/docs/release-notes/rl-2211.adoc @@ -84,6 +84,9 @@ removed since upstream changed the blur settings to be more flexible. You can migrate the blur settings to use <> instead. +* The `services.compton` module has been removed. It was deprecated in +release 20.03. Use `services.picom` instead. + [[sec-release-22.11-state-version-changes]] === State Version Changes diff --git a/modules/modules.nix b/modules/modules.nix index 3c8ca3296..c40282e58 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -185,7 +185,6 @@ let ./services/caffeine.nix ./services/cbatticon.nix ./services/clipmenu.nix - ./services/compton.nix ./services/devilspie2.nix ./services/dropbox.nix ./services/dunst.nix diff --git a/modules/services/compton.nix b/modules/services/compton.nix deleted file mode 100644 index 0b8e7232b..000000000 --- a/modules/services/compton.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; { - imports = let - old = n: [ "services" "compton" n ]; - new = n: [ "services" "picom" n ]; - in [ - (mkRenamedOptionModule (old "activeOpacity") (new "activeOpacity")) - (mkRenamedOptionModule (old "backend") (new "backend")) - (mkRenamedOptionModule (old "blur") (new "blur")) - (mkRenamedOptionModule (old "blurExclude") (new "blurExclude")) - (mkRenamedOptionModule (old "extraOptions") (new "extraOptions")) - (mkRenamedOptionModule (old "fade") (new "fade")) - (mkRenamedOptionModule (old "fadeDelta") (new "fadeDelta")) - (mkRenamedOptionModule (old "fadeExclude") (new "fadeExclude")) - (mkRenamedOptionModule (old "fadeSteps") (new "fadeSteps")) - (mkRenamedOptionModule (old "inactiveDim") (new "inactiveDim")) - (mkRenamedOptionModule (old "inactiveOpacity") (new "inactiveOpacity")) - (mkRenamedOptionModule (old "menuOpacity") (new "menuOpacity")) - (mkRenamedOptionModule (old "noDNDShadow") (new "noDNDShadow")) - (mkRenamedOptionModule (old "noDockShadow") (new "noDockShadow")) - (mkRenamedOptionModule (old "opacityRule") (new "opacityRule")) - (mkRenamedOptionModule (old "package") (new "package")) - (mkRenamedOptionModule (old "refreshRate") (new "refreshRate")) - (mkRenamedOptionModule (old "shadow") (new "shadow")) - (mkRenamedOptionModule (old "shadowExclude") (new "shadowExclude")) - (mkRenamedOptionModule (old "shadowOffsets") (new "shadowOffsets")) - (mkRenamedOptionModule (old "shadowOpacity") (new "shadowOpacity")) - (mkChangedOptionModule (old "vSync") (new "vSync") (v: v != "none")) - ]; - - options.services.compton.enable = mkEnableOption "Compton X11 compositor" // { - visible = false; - }; - - config = mkIf config.services.compton.enable { - warnings = [ - "Obsolete option `services.compton.enable' is used. It was renamed to `services.picom.enable'." - ]; - - services.picom.enable = true; - }; -}