about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-08-09 12:26:15 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-08-09 12:56:11 -0400
commitdb69d2dfe7c44f3d507f119b8f53b2c2bb4563e9 (patch)
tree8e76cd2b47a70be0a845060234396d7e64e6ab95 /nixos/modules/services
parentacbee3c116652a9d49ef9b693e2a2bb1f32fb3cb (diff)
downloadnixlib-db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9.tar
nixlib-db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9.tar.gz
nixlib-db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9.tar.bz2
nixlib-db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9.tar.lz
nixlib-db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9.tar.xz
nixlib-db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9.tar.zst
nixlib-db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9.zip
nixos/evince: move to programs
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/desktops/gnome3/evince.nix35
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix4
2 files changed, 3 insertions, 36 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/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index cd7502421255..8993c895b96c 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -123,7 +123,6 @@ 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;
@@ -157,6 +156,9 @@ in {
     xdg.portal.enable = true;
     xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
+    # Enable default programs
+    programs.evince.enable = mkDefault true;
+
     # If gnome3 is installed, build vim for gtk3 too.
     nixpkgs.config.vim.gui = "gtk3";