diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-09 12:28:41 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-09 12:56:11 -0400 |
| commit | ff0e3aae354dbcf68d783ecf09a851401de2d2e0 (patch) | |
| tree | 1d90f2dc1902809ca0e6831143c0b8c21c32c22e /nixos | |
| parent | db69d2dfe7c44f3d507f119b8f53b2c2bb4563e9 (diff) | |
| download | nixlib-ff0e3aae354dbcf68d783ecf09a851401de2d2e0.tar nixlib-ff0e3aae354dbcf68d783ecf09a851401de2d2e0.tar.gz nixlib-ff0e3aae354dbcf68d783ecf09a851401de2d2e0.tar.bz2 nixlib-ff0e3aae354dbcf68d783ecf09a851401de2d2e0.tar.lz nixlib-ff0e3aae354dbcf68d783ecf09a851401de2d2e0.tar.xz nixlib-ff0e3aae354dbcf68d783ecf09a851401de2d2e0.tar.zst nixlib-ff0e3aae354dbcf68d783ecf09a851401de2d2e0.zip | |
nixos/file-roller: move to programs
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/file-roller.nix (renamed from nixos/modules/services/desktops/gnome3/file-roller.nix) | 11 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 |
3 files changed, 11 insertions, 4 deletions
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/services/desktops/gnome3/file-roller.nix b/nixos/modules/programs/file-roller.nix index 7fb558a98953..64f6a94e7641 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 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"; |