diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-09 12:43:00 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-10 11:17:18 -0400 |
commit | be3fe4a869c731d2fd929b36edf8b12600ec8bc5 (patch) | |
tree | 2dd5f984c87dd2ab658ecf90ae9279ae445ad2b6 | |
parent | f12f2bb828da4ef9d8e37af189cfc588629833d7 (diff) | |
download | nixlib-be3fe4a869c731d2fd929b36edf8b12600ec8bc5.tar nixlib-be3fe4a869c731d2fd929b36edf8b12600ec8bc5.tar.gz nixlib-be3fe4a869c731d2fd929b36edf8b12600ec8bc5.tar.bz2 nixlib-be3fe4a869c731d2fd929b36edf8b12600ec8bc5.tar.lz nixlib-be3fe4a869c731d2fd929b36edf8b12600ec8bc5.tar.xz nixlib-be3fe4a869c731d2fd929b36edf8b12600ec8bc5.tar.zst nixlib-be3fe4a869c731d2fd929b36edf8b12600ec8bc5.zip |
nixos/gpaste: move to programs
-rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
-rw-r--r-- | nixos/modules/programs/gpaste.nix (renamed from nixos/modules/services/desktops/gnome3/gpaste.nix) | 14 |
2 files changed, 12 insertions, 4 deletions
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/services/desktops/gnome3/gpaste.nix b/nixos/modules/programs/gpaste.nix index 5a8258775e0a..33d5f58bfdd4 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 ]; |