diff options
author | adisbladis <adisbladis@gmail.com> | 2020-01-03 12:51:22 +0000 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2020-01-03 12:52:02 +0000 |
commit | aec68f4e7eea7057253d6dae84626b02fcc02225 (patch) | |
tree | c5390e5822f611b0549639e39980445838a1fd1a /nixos/modules/services | |
parent | 74f5c7f3d1acc2938500ab541c1b27769154ca49 (diff) | |
download | nixlib-aec68f4e7eea7057253d6dae84626b02fcc02225.tar nixlib-aec68f4e7eea7057253d6dae84626b02fcc02225.tar.gz nixlib-aec68f4e7eea7057253d6dae84626b02fcc02225.tar.bz2 nixlib-aec68f4e7eea7057253d6dae84626b02fcc02225.tar.lz nixlib-aec68f4e7eea7057253d6dae84626b02fcc02225.tar.xz nixlib-aec68f4e7eea7057253d6dae84626b02fcc02225.tar.zst nixlib-aec68f4e7eea7057253d6dae84626b02fcc02225.zip |
nixos/compton: Rename module to picom
With a backwards compatibility alias
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/x11/picom.nix (renamed from nixos/modules/services/x11/compton.nix) | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/picom.nix index 61174672e2dd..e3bd21be73e4 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/picom.nix @@ -5,7 +5,7 @@ with builtins; let - cfg = config.services.compton; + cfg = config.services.picom; pairOf = x: with types; addCheck (listOf x) (y: length y == 2); @@ -31,20 +31,24 @@ let (key: value: "${toString key}=${mkValueString value};") v) + " }" - else abort "compton.mkValueString: unexpected type (v = ${v})"; + else abort "picom.mkValueString: unexpected type (v = ${v})"; in "${escape [ sep ] k}${sep}${mkValueString v};") attrs); - configFile = pkgs.writeText "compton.conf" (toConf cfg.settings); + configFile = pkgs.writeText "picom.conf" (toConf cfg.settings); in { - options.services.compton = { + imports = [ + (mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ]) + ]; + + options.services.picom = { enable = mkOption { type = types.bool; default = false; description = '' - Whether of not to enable Compton as the X.org composite manager. + Whether of not to enable Picom as the X.org composite manager. ''; }; @@ -85,7 +89,7 @@ in { ]; description = '' List of conditions of windows that should not be faded. - See <literal>compton(1)</literal> man page for more examples. + See <literal>picom(1)</literal> man page for more examples. ''; }; @@ -125,7 +129,7 @@ in { ]; description = '' List of conditions of windows that should have no shadow. - See <literal>compton(1)</literal> man page for more examples. + See <literal>picom(1)</literal> man page for more examples. ''; }; @@ -192,7 +196,7 @@ in { apply = x: let res = x != "none"; - msg = "The type of services.compton.vSync has changed to bool:" + msg = "The type of services.picom.vSync has changed to bool:" + " interpreting ${x} as ${boolToString res}"; in if isBool x then x @@ -222,13 +226,13 @@ in { type = loaOf (types.either configTypes (loaOf (types.either configTypes (loaOf configTypes)))); default = {}; description = '' - Additional Compton configuration. + Additional Picom configuration. ''; }; }; config = mkIf cfg.enable { - services.compton.settings = let + services.picom.settings = let # Hard conversion to float, literally lib.toInt but toFloat toFloat = str: let may_be_float = builtins.fromJSON str; @@ -264,8 +268,8 @@ in { refresh-rate = mkDefault cfg.refreshRate; }; - systemd.user.services.compton = { - description = "Compton composite manager"; + systemd.user.services.picom = { + description = "Picom composite manager"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; @@ -275,13 +279,13 @@ in { }; serviceConfig = { - ExecStart = "${pkgs.compton}/bin/compton --config ${configFile}"; + ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}"; RestartSec = 3; Restart = "always"; }; }; - environment.systemPackages = [ pkgs.compton ]; + environment.systemPackages = [ pkgs.picom ]; }; meta.maintainers = with lib.maintainers; [ rnhmjoj ]; |