Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix
index a69ca8573a7..931bac58ace 100644
--- a/nixos/modules/services/desktops/deepin/deepin.nix
+++ b/nixos/modules/services/desktops/deepin/deepin.nix
@@ -30,8 +30,6 @@
config = lib.mkMerge [
(lib.mkIf config.services.deepin.core.enable {
- programs.dconf.enable = true;
-
environment.systemPackages = [
pkgs.deepin.dde-api
pkgs.deepin.dde-calendar
diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
deleted file mode 100644
index 2acfb9735c1..00000000000
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- xcfg = config.services.xserver;
- cfg = xcfg.desktopManager.deepin;
-
-in
-
-{
- options = {
-
- services.xserver.desktopManager.deepin.enable = mkOption {
- type = types.bool;
- default = false;
- description = "Enable the Deepin Desktop Environment";
- };
-
- };
-
-
- config = mkIf (xcfg.enable && cfg.enable) {
-
- services.xserver.displayManager.sessionPackages = [ pkgs.deepin.startdde ];
- services.xserver.displayManager.defaultSession = "deepin";
-
- hardware.bluetooth.enable = mkDefault true;
- hardware.pulseaudio.enable = mkDefault true;
- security.polkit.enable = true;
- services.accounts-daemon.enable = true;
- services.bamf.enable = true;
- services.deepin.core.enable = true;
- services.gnome3.at-spi2-core.enable = true;
- services.gnome3.glib-networking.enable = true;
- services.gnome3.gnome-keyring.enable = true;
- services.gvfs.enable = true;
- services.udisks2.enable = true;
- services.upower.enable = config.powerManagement.enable;
- services.xserver.libinput.enable = mkDefault true;
- services.xserver.updateDbusEnvironment = true;
-
- networking.networkmanager.enable = true;
-
- fonts.fonts = with pkgs; [ noto-fonts ];
-
- environment.systemPackages = with pkgs; [
- deepin.dde-calendar
- deepin.dde-daemon
- (deepin.dde-dock.override { plugins = [ deepin.dde-file-manager ]; })
- deepin.dde-file-manager
- deepin.dde-kwin
- deepin.dde-launcher
- deepin.dde-polkit-agent
- deepin.dde-session-ui
- deepin.deepin-desktop-base
- deepin.deepin-gtk-theme
- deepin.deepin-icon-theme
- deepin.deepin-image-viewer
- deepin.deepin-movie-reborn
- deepin.deepin-screenshot
- deepin.deepin-shortcut-viewer
- deepin.deepin-sound-theme
- deepin.deepin-terminal
- deepin.deepin-wallpapers
- deepin.dpa-ext-gnomekeyring
- deepin.qt5dxcb-plugin
- deepin.qt5integration
- deepin.startdde
- ];
-
- environment.variables.DDE_POLKIT_PLUGINS_DIRS = [ "${config.system.path}/lib/polkit-1-dde/plugins" ];
-
- environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = [
- "${pkgs.deepin.deepin-desktop-schemas}/share/gsettings-schemas/${pkgs.deepin.deepin-desktop-schemas.name}/glib-2.0/schemas"
- ];
-
- # Link some extra directories in /run/current-system/sw/share
- environment.pathsToLink = [
- "/lib/polkit-1-dde/plugins"
- "/share"
- ];
- };
-}
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 93a3057f2b2..970fa620c6b 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -20,7 +20,7 @@ in
imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
- ./mate.nix ./pantheon.nix ./deepin.nix ./surf-display.nix ./cde.nix
+ ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
];
options = {
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/deepin.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/deepin.nix
deleted file mode 100644
index d4a2b6bc014..00000000000
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/deepin.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- dmcfg = config.services.xserver.displayManager;
- ldmcfg = dmcfg.lightdm;
- cfg = ldmcfg.greeters.deepin;
-
-in
-{
- options = {
-
- services.xserver.displayManager.lightdm.greeters.deepin = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable lightdm-deepin-greeter as the lightdm greeter.
- '';
- };
-
- };
-
- };
-
- config = mkIf (ldmcfg.enable && cfg.enable) {
-
- services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
-
- services.xserver.displayManager.lightdm.greeter = mkDefault {
- package = pkgs.deepin.dde-session-ui.xgreeters;
- name = "lightdm-deepin-greeter";
- };
-
- };
-}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 93722165f9c..f7face0adb7 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -77,7 +77,6 @@ in
./lightdm-greeters/mini.nix
./lightdm-greeters/enso-os.nix
./lightdm-greeters/pantheon.nix
- ./lightdm-greeters/deepin.nix
];
options = {
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index da7d1bf9a3c..a664defae56 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -3,14 +3,12 @@
deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore,
dtkwidget, gnugrep, gsettings-qt, lightdm_qt,
onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which,
- xkeyboard_config, xorg, xrandr, wrapGAppsHook, linkFarm, dde-session-ui }:
+ xkeyboard_config, xorg, xrandr, wrapGAppsHook }:
mkDerivation rec {
pname = "dde-session-ui";
version = "5.0.0";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
@@ -123,14 +121,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging
'';
- passthru = {
- updateScript = deepin.updateScript { inherit name; };
-
- xgreeters = linkFarm "deepin-greeter-xgreeters" [{
- path = "${dde-session-ui}/share/xgreeters/lightdm-deepin-greeter.desktop";
- name = "lightdm-deepin-greeter.desktop";
- }];
- };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin desktop-environment - Session UI module";
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.