From a8167d10f6d346e6af09ffe10b8505dd3c3cd097 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 16:37:28 -0400 Subject: [PATCH 1/5] xfceUnstable: make an alias To be removed with xfce4-12. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d2d438cf099..6a41829dc7b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -390,6 +390,7 @@ mapAliases ({ winusb = woeusb; # added 2017-12-22 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 + xfceUnstable = xfce4-14; # added 2019-09-17 x11 = xlibsWrapper; # added 2015-09 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ba6e479366..1bb8868db8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22704,7 +22704,6 @@ in solarc-gtk-theme = callPackage ../misc/themes/solarc { }; xfce = xfce4-12; - xfceUnstable = xfce4-14; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { }); From 5bcec7642fcfc3dec003db62f7634d811e28ed90 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 16:40:00 -0400 Subject: [PATCH 2/5] nixos/xfce4-14: remove gtk-xfce-engine Xfce 4.14 deprecated this. It had many gtk2 themes that don't work that confused users #68977. --- nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 1 - pkgs/desktops/xfce4-14/default.nix | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index 57d1268d655..ae7ee322c64 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -69,7 +69,6 @@ in exo garcon - gtk-xfce-engine libxfce4ui xfconf diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix index 294dfa92c79..0e2c8c1696b 100644 --- a/pkgs/desktops/xfce4-14/default.nix +++ b/pkgs/desktops/xfce4-14/default.nix @@ -93,8 +93,6 @@ makeScope newScope (self: with self; { ## COMMON PARTS WITH XFCE 4.12 - gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; }; - xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { }; xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { }; @@ -113,7 +111,6 @@ makeScope newScope (self: with self; { ## ALIASES - - # added 2019-08-18 - xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; + xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 + gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 }) From f85e126f8ce44e8be17807305422f8cba2991ede Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 16:44:35 -0400 Subject: [PATCH 3/5] nixos/xfce4-14: add gnome-themes-extra --- nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index ae7ee322c64..ca51df88eef 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -53,6 +53,7 @@ in glib # for gsettings gtk3.out # gtk-update-icon-cache + gnome3.gnome-themes-extra gnome3.adwaita-icon-theme hicolor-icon-theme tango-icon-theme From f6398d8ba2729778ea0ae0a0d283335997721d26 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 17:02:59 -0400 Subject: [PATCH 4/5] nixos/xfce4-14: cleanup defaults slightly We added - parole - pavucontrol - xfce4-taskmanager - xfwm4-themes to the default packages. --- .../services/x11/desktop-managers/xfce4-14.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index ca51df88eef..a521e4a8a8d 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -74,11 +74,14 @@ in xfconf mousepad + parole + pavucontrol ristretto xfce4-appfinder xfce4-screenshooter xfce4-session xfce4-settings + xfce4-taskmanager xfce4-terminal # TODO: resync patch for plugins @@ -88,10 +91,12 @@ in ++ optional config.networking.networkmanager.enable networkmanagerapplet ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin ++ optional config.powerManagement.enable xfce4-power-manager - ++ optional cfg.enableXfwm xfwm4 - ++ optionals (!cfg.noDesktop) [ - xfce4-panel + ++ optionals cfg.enableXfwm [ + xfwm4 + xfwm4-themes + ] ++ optionals (!cfg.noDesktop) [ xfce4-notifyd + xfce4-panel xfdesktop ]; From 0b73294d60c14a9865bc9317acee2f14716f4d4e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 19:49:18 -0400 Subject: [PATCH 5/5] fixup! nixos/xfce4-14: cleanup defaults slightly --- nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index a521e4a8a8d..f0f47cb70dc 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -75,7 +75,6 @@ in mousepad parole - pavucontrol ristretto xfce4-appfinder xfce4-screenshooter @@ -89,9 +88,11 @@ in thunar ] # TODO: NetworkManager doesn't belong here ++ optional config.networking.networkmanager.enable networkmanagerapplet - ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin ++ optional config.powerManagement.enable xfce4-power-manager - ++ optionals cfg.enableXfwm [ + ++ optionals config.hardware.pulseaudio.enable [ + pavucontrol + xfce4-pulseaudio-plugin + ] ++ optionals cfg.enableXfwm [ xfwm4 xfwm4-themes ] ++ optionals (!cfg.noDesktop) [