From db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 9 Aug 2019 12:26:15 -0400
Subject: nixos/evince: move to programs

---
 nixos/modules/services/desktops/gnome3/evince.nix  | 35 ----------------------
 .../services/x11/desktop-managers/gnome3.nix       |  4 ++-
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 nixos/modules/services/desktops/gnome3/evince.nix

(limited to 'nixos/modules/services')

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";
 
-- 
cgit 1.4.1


From ff0e3aae354dbcf68d783ecf09a851401de2d2e0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 9 Aug 2019 12:28:41 -0400
Subject: nixos/file-roller: move to programs

---
 nixos/modules/module-list.nix                      |  2 +-
 nixos/modules/programs/file-roller.nix             | 39 ++++++++++++++++++++++
 .../services/desktops/gnome3/file-roller.nix       | 32 ------------------
 .../services/x11/desktop-managers/gnome3.nix       |  2 +-
 4 files changed, 41 insertions(+), 34 deletions(-)
 create mode 100644 nixos/modules/programs/file-roller.nix
 delete mode 100644 nixos/modules/services/desktops/gnome3/file-roller.nix

(limited to 'nixos/modules/services')

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3a6819f1b768..47d22f6c83d3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -107,6 +107,7 @@
   ./programs/dmrconfig.nix
   ./programs/environment.nix
   ./programs/evince.nix
+  ./programs/file-roller.nix
   ./programs/firejail.nix
   ./programs/fish.nix
   ./programs/freetds.nix
@@ -282,7 +283,6 @@
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/chrome-gnome-shell.nix
   ./services/desktops/gnome3/evolution-data-server.nix
-  ./services/desktops/gnome3/file-roller.nix
   ./services/desktops/gnome3/glib-networking.nix
   ./services/desktops/gnome3/gnome-disks.nix
   ./services/desktops/gnome3/gnome-documents.nix
diff --git a/nixos/modules/programs/file-roller.nix b/nixos/modules/programs/file-roller.nix
new file mode 100644
index 000000000000..64f6a94e7641
--- /dev/null
+++ b/nixos/modules/programs/file-roller.nix
@@ -0,0 +1,39 @@
+# File Roller.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+  # Added 2019-08-09
+  imports = [
+    (mkRenamedOptionModule
+      [ "services" "gnome3" "file-roller" "enable" ]
+      [ "programs" "file-roller" "enable" ])
+  ];
+
+  ###### interface
+
+  options = {
+
+    programs.file-roller = {
+
+      enable = mkEnableOption "File Roller, an archive manager for GNOME";
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.programs.file-roller.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.file-roller ];
+
+    services.dbus.packages = [ pkgs.gnome3.file-roller ];
+
+  };
+
+}
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/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 8993c895b96c..bae4e7eb4614 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -124,7 +124,6 @@ in {
     services.dleyna-server.enable = mkDefault true;
     services.gnome3.at-spi2-core.enable = 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;
@@ -158,6 +157,7 @@ in {
 
     # Enable default programs
     programs.evince.enable = mkDefault true;
+    programs.file-roller.enable = mkDefault true;
 
     # If gnome3 is installed, build vim for gtk3 too.
     nixpkgs.config.vim.gui = "gtk3";
-- 
cgit 1.4.1


From 6c525b1076431a8ed54505c39360610138d3634c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 9 Aug 2019 12:33:49 -0400
Subject: nixos/gnome-disks: move to programs

---
 nixos/modules/module-list.nix                      |  2 +-
 nixos/modules/programs/gnome-disks.nix             | 46 ++++++++++++++++++++++
 .../services/desktops/gnome3/gnome-disks.nix       | 39 ------------------
 .../services/x11/desktop-managers/gnome3.nix       |  2 +-
 4 files changed, 48 insertions(+), 41 deletions(-)
 create mode 100644 nixos/modules/programs/gnome-disks.nix
 delete mode 100644 nixos/modules/services/desktops/gnome3/gnome-disks.nix

(limited to 'nixos/modules/services')

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 47d22f6c83d3..77d896316e9f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -111,6 +111,7 @@
   ./programs/firejail.nix
   ./programs/fish.nix
   ./programs/freetds.nix
+  ./programs/gnome-disks.nix
   ./programs/gnupg.nix
   ./programs/gphoto2.nix
   ./programs/iftop.nix
@@ -284,7 +285,6 @@
   ./services/desktops/gnome3/chrome-gnome-shell.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/glib-networking.nix
-  ./services/desktops/gnome3/gnome-disks.nix
   ./services/desktops/gnome3/gnome-documents.nix
   ./services/desktops/gnome3/gnome-keyring.nix
   ./services/desktops/gnome3/gnome-online-accounts.nix
diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix
new file mode 100644
index 000000000000..1cf839a6ddb0
--- /dev/null
+++ b/nixos/modules/programs/gnome-disks.nix
@@ -0,0 +1,46 @@
+# GNOME Disks.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+  # Added 2019-08-09
+  imports = [
+    (mkRenamedOptionModule
+      [ "services" "gnome3" "gnome-disks" "enable" ]
+      [ "programs" "gnome-disks" "enable" ])
+  ];
+
+  ###### interface
+
+  options = {
+
+    programs.gnome-disks = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GNOME Disks daemon, a program designed to
+          be a UDisks2 graphical front-end.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.programs.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-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";
-- 
cgit 1.4.1


From f12f2bb828da4ef9d8e37af189cfc588629833d7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 9 Aug 2019 12:36:49 -0400
Subject: nixos/gnome-documents: move to programs

---
 nixos/modules/module-list.nix                      |  2 +-
 nixos/modules/programs/gnome-documents.nix         | 50 ++++++++++++++++++++++
 .../services/desktops/gnome3/gnome-documents.nix   | 43 -------------------
 .../services/x11/desktop-managers/gnome3.nix       |  2 +-
 4 files changed, 52 insertions(+), 45 deletions(-)
 create mode 100644 nixos/modules/programs/gnome-documents.nix
 delete mode 100644 nixos/modules/services/desktops/gnome3/gnome-documents.nix

(limited to 'nixos/modules/services')

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 77d896316e9f..1228ddddcffb 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -112,6 +112,7 @@
   ./programs/fish.nix
   ./programs/freetds.nix
   ./programs/gnome-disks.nix
+  ./programs/gnome-documents.nix
   ./programs/gnupg.nix
   ./programs/gphoto2.nix
   ./programs/iftop.nix
@@ -285,7 +286,6 @@
   ./services/desktops/gnome3/chrome-gnome-shell.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/glib-networking.nix
-  ./services/desktops/gnome3/gnome-documents.nix
   ./services/desktops/gnome3/gnome-keyring.nix
   ./services/desktops/gnome3/gnome-online-accounts.nix
   ./services/desktops/gnome3/gnome-remote-desktop.nix
diff --git a/nixos/modules/programs/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix
new file mode 100644
index 000000000000..bfa3d409ee30
--- /dev/null
+++ b/nixos/modules/programs/gnome-documents.nix
@@ -0,0 +1,50 @@
+# GNOME Documents.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+  # Added 2019-08-09
+  imports = [
+    (mkRenamedOptionModule
+      [ "services" "gnome3" "gnome-documents" "enable" ]
+      [ "programs" "gnome-documents" "enable" ])
+  ];
+
+  ###### interface
+
+  options = {
+
+    programs.gnome-documents = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GNOME Documents, a document
+          manager application for GNOME.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.programs.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/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/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 565ca0aac96c..5e1e652a5089 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-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;
@@ -158,6 +157,7 @@ in {
     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";
-- 
cgit 1.4.1


From be3fe4a869c731d2fd929b36edf8b12600ec8bc5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 9 Aug 2019 12:43:00 -0400
Subject: nixos/gpaste: move to programs

---
 nixos/modules/module-list.nix                     |  2 +-
 nixos/modules/programs/gpaste.nix                 | 35 +++++++++++++++++++++++
 nixos/modules/services/desktops/gnome3/gpaste.nix | 27 -----------------
 3 files changed, 36 insertions(+), 28 deletions(-)
 create mode 100644 nixos/modules/programs/gpaste.nix
 delete mode 100644 nixos/modules/services/desktops/gnome3/gpaste.nix

(limited to 'nixos/modules/services')

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1228ddddcffb..75e513b76c67 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -113,6 +113,7 @@
   ./programs/freetds.nix
   ./programs/gnome-disks.nix
   ./programs/gnome-documents.nix
+  ./programs/gpaste.nix
   ./programs/gnupg.nix
   ./programs/gphoto2.nix
   ./programs/iftop.nix
@@ -293,7 +294,6 @@
   ./services/desktops/gnome3/gnome-settings-daemon.nix
   ./services/desktops/gnome3/gnome-terminal-server.nix
   ./services/desktops/gnome3/gnome-user-share.nix
-  ./services/desktops/gnome3/gpaste.nix
   ./services/desktops/gnome3/gvfs.nix
   ./services/desktops/gnome3/rygel.nix
   ./services/desktops/gnome3/seahorse.nix
diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix
new file mode 100644
index 000000000000..33d5f58bfdd4
--- /dev/null
+++ b/nixos/modules/programs/gpaste.nix
@@ -0,0 +1,35 @@
+# GPaste.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+  # Added 2019-08-09
+  imports = [
+    (mkRenamedOptionModule
+      [ "services" "gnome3" "gpaste" "enable" ]
+      [ "programs" "gpaste" "enable" ])
+  ];
+
+  ###### interface
+  options = {
+     programs.gpaste = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GPaste, a clipboard manager.
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+  config = mkIf config.programs.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/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 ];
-  };
-}
-- 
cgit 1.4.1