diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-20 09:25:37 -0500 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-20 09:25:37 -0500 |
commit | 1ec2b545dd0384de592d4de2743c6afd6c7f523e (patch) | |
tree | b01a2bd7bdf7a1be9b79be54e0241372df1e2a5f | |
parent | 313eba4451cb8e75001213f7a4aabafd124b6396 (diff) | |
download | nixpkgs-1ec2b545dd0384de592d4de2743c6afd6c7f523e.tar nixpkgs-1ec2b545dd0384de592d4de2743c6afd6c7f523e.tar.gz nixpkgs-1ec2b545dd0384de592d4de2743c6afd6c7f523e.tar.bz2 nixpkgs-1ec2b545dd0384de592d4de2743c6afd6c7f523e.tar.lz nixpkgs-1ec2b545dd0384de592d4de2743c6afd6c7f523e.tar.xz nixpkgs-1ec2b545dd0384de592d4de2743c6afd6c7f523e.tar.zst nixpkgs-1ec2b545dd0384de592d4de2743c6afd6c7f523e.zip |
nixos/pantheon/files: remove
Made nun sense.
-rw-r--r-- | nixos/modules/services/desktops/pantheon/files.nix | 31 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 |
2 files changed, 3 insertions, 29 deletions
diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix index 577aad6c298..8cee9f42b62 100644 --- a/nixos/modules/services/desktops/pantheon/files.nix +++ b/nixos/modules/services/desktops/pantheon/files.nix @@ -6,33 +6,8 @@ with lib; { - meta.maintainers = pkgs.pantheon.maintainers; - - ###### interface - - options = { - - services.pantheon.files = { - - enable = mkEnableOption "pantheon files daemon"; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.pantheon.files.enable { - - environment.systemPackages = [ - pkgs.pantheon.elementary-files - ]; - - services.dbus.packages = [ - pkgs.pantheon.elementary-files - ]; - - }; + imports = [ + (mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`") + ]; } diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e07d5b5eaad..7274b49abd7 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -106,7 +106,6 @@ in services.accounts-daemon.enable = true; services.bamf.enable = true; services.colord.enable = mkDefault true; - services.pantheon.files.enable = mkDefault true; services.tumbler.enable = mkDefault true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.dbus.packages = with pkgs.pantheon; [ |