diff options
author | José Romildo <malaquias@gmail.com> | 2022-06-26 13:54:59 -0300 |
---|---|---|
committer | José Romildo <malaquias@gmail.com> | 2022-06-26 14:29:01 -0300 |
commit | d18aeb6351482911fc63cb086ca49d20acabc4d0 (patch) | |
tree | 1a22d02c6436a2627ad682d8bf1702244b259d44 | |
parent | c7c3c6586cb7328bed8872b89e2c85f78ca4ae38 (diff) | |
download | nixpkgs-d18aeb6351482911fc63cb086ca49d20acabc4d0.tar nixpkgs-d18aeb6351482911fc63cb086ca49d20acabc4d0.tar.gz nixpkgs-d18aeb6351482911fc63cb086ca49d20acabc4d0.tar.bz2 nixpkgs-d18aeb6351482911fc63cb086ca49d20acabc4d0.tar.lz nixpkgs-d18aeb6351482911fc63cb086ca49d20acabc4d0.tar.xz nixpkgs-d18aeb6351482911fc63cb086ca49d20acabc4d0.tar.zst nixpkgs-d18aeb6351482911fc63cb086ca49d20acabc4d0.zip |
nixos/xfconf: init
- Add a module for xfconf, the Xfce configuration storage system.
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
-rw-r--r-- | nixos/modules/programs/thunar.nix | 3 | ||||
-rw-r--r-- | nixos/modules/programs/xfconf.nix | 27 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 5 |
6 files changed, 41 insertions, 4 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index f29f30660be..6f5451f89b1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -319,6 +319,13 @@ release it may be removed. </para> </listitem> + <listitem> + <para> + There is a new module for the <literal>xfconf</literal> + program (the Xfce configuration storage system), which has a + dbus service. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 89a59edee79..0a92780d9ce 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -118,4 +118,6 @@ Use `configure.packages` instead. - There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. +- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b757e05edce..251b4b31961 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -230,6 +230,7 @@ ./programs/weylus.nix ./programs/wireshark.nix ./programs/wshowkeys.nix + ./programs/xfconf.nix ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/xss-lock.nix diff --git a/nixos/modules/programs/thunar.nix b/nixos/modules/programs/thunar.nix index 343f8469867..5ea2982dd93 100644 --- a/nixos/modules/programs/thunar.nix +++ b/nixos/modules/programs/thunar.nix @@ -33,12 +33,13 @@ in { services.dbus.packages = [ package - pkgs.xfce.xfconf ]; systemd.packages = [ package ]; + + programs.xfconf.enable = true; } ); } diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix new file mode 100644 index 00000000000..8e854b40e51 --- /dev/null +++ b/nixos/modules/programs/xfconf.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.programs.xfconf; + +in { + meta = { + maintainers = teams.xfce.members; + }; + + options = { + programs.xfconf = { + enable = mkEnableOption "Xfconf, the Xfce configuration storage system"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + pkgs.xfce.xfconf + ]; + + services.dbus.packages = [ + pkgs.xfce.xfconf + ]; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 3c2dac386f5..3a468b55062 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -4,10 +4,9 @@ with lib; let cfg = config.services.xserver.desktopManager.xfce; -in +in { - meta = { maintainers = teams.xfce.members; }; @@ -95,7 +94,6 @@ in exo garcon libxfce4ui - xfconf mousepad parole @@ -125,6 +123,7 @@ in xfdesktop ] ++ optional cfg.enableScreensaver xfce4-screensaver; + programs.xfconf.enable = true; programs.thunar.enable = true; environment.pathsToLink = [ |