about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/desktops/gnome3/gnome-disks.nix39
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix2
2 files changed, 1 insertions, 40 deletions
diff --git a/nixos/modules/services/desktops/gnome3/gnome-disks.nix b/nixos/modules/services/desktops/gnome3/gnome-disks.nix
deleted file mode 100644
index 139534cdb892..000000000000
--- a/nixos/modules/services/desktops/gnome3/gnome-disks.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# GNOME Disks daemon.
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.gnome3.gnome-disks = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable GNOME Disks daemon, a service designed to
-          be a UDisks2 graphical front-end.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.gnome3.gnome-disks.enable {
-
-    environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ];
-
-    services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ];
-
-  };
-
-}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index bae4e7eb4614..565ca0aac96c 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -125,7 +125,6 @@ in {
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.evolution-data-server.enable = true;
     services.gnome3.glib-networking.enable = true;
-    services.gnome3.gnome-disks.enable = mkDefault true;
     services.gnome3.gnome-documents.enable = mkDefault true;
     services.gnome3.gnome-keyring.enable = true;
     services.gnome3.gnome-online-accounts.enable = mkDefault true;
@@ -158,6 +157,7 @@ in {
     # Enable default programs
     programs.evince.enable = mkDefault true;
     programs.file-roller.enable = mkDefault true;
+    programs.gnome-disks.enable = mkDefault true;
 
     # If gnome3 is installed, build vim for gtk3 too.
     nixpkgs.config.vim.gui = "gtk3";