From db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 9 Aug 2019 12:26:15 -0400 Subject: [PATCH 1/6] nixos/evince: move to programs --- nixos/modules/module-list.nix | 2 +- .../desktops/gnome3 => programs}/evince.nix | 13 ++++++++++--- .../services/x11/desktop-managers/gnome3.nix | 4 +++- 3 files changed, 14 insertions(+), 5 deletions(-) rename nixos/modules/{services/desktops/gnome3 => programs}/evince.nix (53%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index df453aac9fe..3a6819f1b76 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -106,6 +106,7 @@ ./programs/digitalbitbox/default.nix ./programs/dmrconfig.nix ./programs/environment.nix + ./programs/evince.nix ./programs/firejail.nix ./programs/fish.nix ./programs/freetds.nix @@ -280,7 +281,6 @@ ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix - ./services/desktops/gnome3/evince.nix ./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/file-roller.nix ./services/desktops/gnome3/glib-networking.nix diff --git a/nixos/modules/services/desktops/gnome3/evince.nix b/nixos/modules/programs/evince.nix similarity index 53% rename from nixos/modules/services/desktops/gnome3/evince.nix rename to nixos/modules/programs/evince.nix index 5f040a16f06..473fddb09d0 100644 --- a/nixos/modules/services/desktops/gnome3/evince.nix +++ b/nixos/modules/programs/evince.nix @@ -6,14 +6,21 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "evince" "enable" ] + [ "programs" "evince" "enable" ]) + ]; + ###### interface options = { - services.gnome3.evince = { + programs.evince = { enable = mkEnableOption - "systemd and dbus services for Evince, the GNOME document viewer"; + "Evince, the GNOME document viewer"; }; @@ -22,7 +29,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.evince.enable { + config = mkIf config.programs.evince.enable { environment.systemPackages = [ pkgs.evince ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index cd750242125..8993c895b96 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"; From ff0e3aae354dbcf68d783ecf09a851401de2d2e0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 9 Aug 2019 12:28:41 -0400 Subject: [PATCH 2/6] nixos/file-roller: move to programs --- nixos/modules/module-list.nix | 2 +- .../desktops/gnome3 => programs}/file-roller.nix | 11 +++++++++-- .../modules/services/x11/desktop-managers/gnome3.nix | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) rename nixos/modules/{services/desktops/gnome3 => programs}/file-roller.nix (57%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3a6819f1b76..47d22f6c83d 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/services/desktops/gnome3/file-roller.nix b/nixos/modules/programs/file-roller.nix similarity index 57% rename from nixos/modules/services/desktops/gnome3/file-roller.nix rename to nixos/modules/programs/file-roller.nix index 7fb558a9895..64f6a94e764 100644 --- a/nixos/modules/services/desktops/gnome3/file-roller.nix +++ b/nixos/modules/programs/file-roller.nix @@ -6,11 +6,18 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "file-roller" "enable" ] + [ "programs" "file-roller" "enable" ]) + ]; + ###### interface options = { - services.gnome3.file-roller = { + programs.file-roller = { enable = mkEnableOption "File Roller, an archive manager for GNOME"; @@ -21,7 +28,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.file-roller.enable { + config = mkIf config.programs.file-roller.enable { environment.systemPackages = [ 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 8993c895b96..bae4e7eb461 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"; From 6c525b1076431a8ed54505c39360610138d3634c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 9 Aug 2019 12:33:49 -0400 Subject: [PATCH 3/6] nixos/gnome-disks: move to programs --- nixos/modules/module-list.nix | 2 +- .../desktops/gnome3 => programs}/gnome-disks.nix | 15 +++++++++++---- .../services/x11/desktop-managers/gnome3.nix | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) rename nixos/modules/{services/desktops/gnome3 => programs}/gnome-disks.nix (57%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 47d22f6c83d..77d896316e9 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/services/desktops/gnome3/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix similarity index 57% rename from nixos/modules/services/desktops/gnome3/gnome-disks.nix rename to nixos/modules/programs/gnome-disks.nix index 139534cdb89..1cf839a6ddb 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -1,4 +1,4 @@ -# GNOME Disks daemon. +# GNOME Disks. { config, pkgs, lib, ... }: @@ -6,17 +6,24 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-disks" "enable" ] + [ "programs" "gnome-disks" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gnome-disks = { + programs.gnome-disks = { enable = mkOption { type = types.bool; default = false; description = '' - Whether to enable GNOME Disks daemon, a service designed to + Whether to enable GNOME Disks daemon, a program designed to be a UDisks2 graphical front-end. ''; }; @@ -28,7 +35,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-disks.enable { + config = mkIf config.programs.gnome-disks.enable { environment.systemPackages = [ 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 bae4e7eb461..565ca0aac96 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"; From f12f2bb828da4ef9d8e37af189cfc588629833d7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 9 Aug 2019 12:36:49 -0400 Subject: [PATCH 4/6] nixos/gnome-documents: move to programs --- nixos/modules/module-list.nix | 2 +- .../gnome3 => programs}/gnome-documents.nix | 15 +++++++++++---- .../services/x11/desktop-managers/gnome3.nix | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) rename nixos/modules/{services/desktops/gnome3 => programs}/gnome-documents.nix (61%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 77d896316e9..1228ddddcff 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/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix similarity index 61% rename from nixos/modules/services/desktops/gnome3/gnome-documents.nix rename to nixos/modules/programs/gnome-documents.nix index f6efb668424..bfa3d409ee3 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix +++ b/nixos/modules/programs/gnome-documents.nix @@ -1,4 +1,4 @@ -# GNOME Documents daemon. +# GNOME Documents. { config, pkgs, lib, ... }: @@ -6,17 +6,24 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-documents" "enable" ] + [ "programs" "gnome-documents" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gnome-documents = { + programs.gnome-documents = { enable = mkOption { type = types.bool; default = false; description = '' - Whether to enable GNOME Documents services, a document + Whether to enable GNOME Documents, a document manager application for GNOME. ''; }; @@ -28,7 +35,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-documents.enable { + config = mkIf config.programs.gnome-documents.enable { environment.systemPackages = [ pkgs.gnome3.gnome-documents ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 565ca0aac96..5e1e652a508 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"; From be3fe4a869c731d2fd929b36edf8b12600ec8bc5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 9 Aug 2019 12:43:00 -0400 Subject: [PATCH 5/6] nixos/gpaste: move to programs --- nixos/modules/module-list.nix | 2 +- .../desktops/gnome3 => programs}/gpaste.nix | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) rename nixos/modules/{services/desktops/gnome3 => programs}/gpaste.nix (69%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1228ddddcff..75e513b76c6 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/services/desktops/gnome3/gpaste.nix b/nixos/modules/programs/gpaste.nix similarity index 69% rename from nixos/modules/services/desktops/gnome3/gpaste.nix rename to nixos/modules/programs/gpaste.nix index 5a8258775e0..33d5f58bfdd 100644 --- a/nixos/modules/services/desktops/gnome3/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -1,12 +1,20 @@ -# GPaste daemon. +# GPaste. { config, lib, pkgs, ... }: with lib; { + + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gpaste" "enable" ] + [ "programs" "gpaste" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gpaste = { + programs.gpaste = { enable = mkOption { type = types.bool; default = false; @@ -18,7 +26,7 @@ with lib; }; ###### implementation - config = mkIf config.services.gnome3.gpaste.enable { + 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 ]; From 0722e88665c58c871161453d11c22ace85ff48d8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 10 Aug 2019 07:10:40 -0400 Subject: [PATCH 6/6] nixos/gpaste: don't set sessionPath Not needed since f63d94eba34 --- nixos/modules/programs/gpaste.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix index 33d5f58bfdd..4f6deb77e5e 100644 --- a/nixos/modules/programs/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -29,7 +29,6 @@ with lib; 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 ]; }; }