Merge pull request #310778 from wineee/dde23

deepin desktop environment: update

2 files changed, 50 insertions, 3 deletions

diff --git a/nixos/modules/services/desktops/deepin/deepin-anything.nix b/nixos/modules/services/desktops/deepin/deepin-anything.nix
new file mode 100644
index 000000000000..4e88a789551b
--- /dev/null
+++ b/nixos/modules/services/desktops/deepin/deepin-anything.nix
@@ -0,0 +1,38 @@
+{ config, pkgs, lib, ... }:
+
+{
+
+  meta = {
+    maintainers = lib.teams.deepin.members;
+  };
+
+  options = {
+
+    services.deepin.deepin-anything = {
+
+      enable = lib.mkEnableOption "deepin anything file search tool";
+
+    };
+
+  };
+
+  config = lib.mkIf config.services.deepin.dde-api.enable {
+    environment.systemPackages = [ pkgs.deepin.deepin-anything ];
+
+    services.dbus.packages = [ pkgs.deepin.deepin-anything ];
+
+    users.groups.deepin-anything = { };
+
+    users.users.deepin-anything = {
+      description = "Deepin Anything Server";
+      home = "/var/lib/deepin-anything";
+      createHome = true;
+      group = "deepin-anything";
+      isSystemUser = true;
+    };
+
+    boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything-module ];
+    boot.kernelModules = [ "vfs_monitor" ];
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
index 30bd14adb419..1151178a8824 100644
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -53,6 +53,7 @@ in
       services.deepin.dde-daemon.enable = mkForce true;
       services.deepin.dde-api.enable = mkForce true;
       services.deepin.app-services.enable = mkForce true;
+      services.deepin.deepin-anything.enable = mkDefault true;
 
       services.colord.enable = mkDefault true;
       services.accounts-daemon.enable = mkDefault true;
@@ -98,11 +99,12 @@ in
         "/share/dsg"
         "/share/deepin-themes"
         "/share/deepin"
+        "/share/dde-shell"
       ];
 
       environment.etc = {
         "deepin-installer.conf".text = ''
-          system_info_vendor_name="Copyright (c) 2003-2023 NixOS contributors"
+          system_info_vendor_name="Copyright (c) 2003-2024 NixOS contributors"
         '';
       };
 
@@ -140,8 +142,10 @@ in
             dtkwidget
             dtkdeclarative
             qt5platform-plugins
+            qt6platform-plugins
+            qt5integration
+            qt6integration
             deepin-pw-check
-            deepin-turbo
 
             dde-account-faces
             deepin-icon-theme
@@ -152,7 +156,9 @@ in
             deepin-desktop-base
 
             startdde
+            # TODO: should remove dde-dock, but dde-shell still need it's dconfig
             dde-dock
+            dde-shell
             dde-launchpad
             dde-session-ui
             dde-session-shell
@@ -171,6 +177,7 @@ in
             dde-appearance
             dde-application-manager
             deepin-service-manager
+            dde-grand-search
           ];
           optionalPackages = [
             onboard # dde-dock plugin
@@ -194,7 +201,7 @@ in
         ++ utils.removePackagesByName optionalPackages config.environment.deepin.excludePackages;
 
       services.dbus.packages = with pkgs.deepin; [
-        dde-dock
+        dde-shell
         dde-launchpad
         dde-session-ui
         dde-session-shell
@@ -209,9 +216,11 @@ in
         dde-appearance
         dde-application-manager
         deepin-service-manager
+        dde-grand-search
       ];
 
       systemd.packages = with pkgs.deepin; [
+        dde-shell
         dde-launchpad
         dde-file-manager
         dde-calendar