Merge pull request #66398 from worldofpeace/gnome3-option-renames

Move certain GNOME3 options to programs

6 files changed, 6 insertions, 180 deletions

diff --git a/nixos/modules/services/desktops/gnome3/evince.nix b/nixos/modules/services/desktops/gnome3/evince.nix
deleted file mode 100644
index 5f040a16f067..000000000000
--- a/nixos/modules/services/desktops/gnome3/evince.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# Evince.
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.gnome3.evince = {
-
-      enable = mkEnableOption
-        "systemd and dbus services for Evince, the GNOME document viewer";
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.gnome3.evince.enable {
-
-    environment.systemPackages = [ pkgs.evince ];
-
-    services.dbus.packages = [ pkgs.evince ];
-
-    systemd.packages = [ pkgs.evince ];
-
-  };
-
-}
diff --git a/nixos/modules/services/desktops/gnome3/file-roller.nix b/nixos/modules/services/desktops/gnome3/file-roller.nix
deleted file mode 100644
index 7fb558a98953..000000000000
--- a/nixos/modules/services/desktops/gnome3/file-roller.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# File Roller.
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.gnome3.file-roller = {
-
-      enable = mkEnableOption "File Roller, an archive manager for GNOME";
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.gnome3.file-roller.enable {
-
-    environment.systemPackages = [ pkgs.gnome3.file-roller ];
-
-    services.dbus.packages = [ pkgs.gnome3.file-roller ];
-
-  };
-
-}
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/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
deleted file mode 100644
index f6efb6684240..000000000000
--- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-# GNOME Documents daemon.
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.gnome3.gnome-documents = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable GNOME Documents services, a document
-          manager application for GNOME.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.gnome3.gnome-documents.enable {
-
-    environment.systemPackages = [ pkgs.gnome3.gnome-documents ];
-
-    services.dbus.packages = [ pkgs.gnome3.gnome-documents ];
-
-    services.gnome3.gnome-online-accounts.enable = true;
-
-    services.gnome3.gnome-online-miners.enable = true;
-
-  };
-
-}
diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/services/desktops/gnome3/gpaste.nix
deleted file mode 100644
index 5a8258775e0a..000000000000
--- a/nixos/modules/services/desktops/gnome3/gpaste.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# GPaste daemon.
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-  ###### interface
-  options = {
-    services.gnome3.gpaste = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable GPaste, a clipboard manager.
-        '';
-      };
-    };
-  };
-
-  ###### implementation
-  config = mkIf config.services.gnome3.gpaste.enable {
-    environment.systemPackages = [ pkgs.gnome3.gpaste ];
-    services.dbus.packages = [ pkgs.gnome3.gpaste ];
-    services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ];
-    systemd.packages = [ pkgs.gnome3.gpaste ];
-  };
-}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index cd7502421255..5e1e652a5089 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -123,12 +123,8 @@ in {
     services.dleyna-renderer.enable = mkDefault true;
     services.dleyna-server.enable = mkDefault true;
     services.gnome3.at-spi2-core.enable = true;
-    services.gnome3.evince.enable = mkDefault true;
     services.gnome3.evolution-data-server.enable = true;
-    services.gnome3.file-roller.enable = mkDefault 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;
     services.gnome3.gnome-remote-desktop.enable = mkDefault true;
@@ -157,6 +153,12 @@ in {
     xdg.portal.enable = true;
     xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
+    # Enable default programs
+    programs.evince.enable = mkDefault true;
+    programs.file-roller.enable = mkDefault true;
+    programs.gnome-disks.enable = mkDefault true;
+    programs.gnome-documents.enable = mkDefault true;
+
     # If gnome3 is installed, build vim for gtk3 too.
     nixpkgs.config.vim.gui = "gtk3";