diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-27 04:03:10 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-30 20:42:01 -0400 |
| commit | 90319d5e33d3fe04ce8ec5137c4df77addcbdeb5 (patch) | |
| tree | 4b027809b57c1a2e6dc0dec230d25705217d2663 | |
| parent | f0dce64acd40847c84b5f4ae5f84aab1bdd1c780 (diff) | |
| download | nixlib-90319d5e33d3fe04ce8ec5137c4df77addcbdeb5.tar nixlib-90319d5e33d3fe04ce8ec5137c4df77addcbdeb5.tar.gz nixlib-90319d5e33d3fe04ce8ec5137c4df77addcbdeb5.tar.bz2 nixlib-90319d5e33d3fe04ce8ec5137c4df77addcbdeb5.tar.lz nixlib-90319d5e33d3fe04ce8ec5137c4df77addcbdeb5.tar.xz nixlib-90319d5e33d3fe04ce8ec5137c4df77addcbdeb5.tar.zst nixlib-90319d5e33d3fe04ce8ec5137c4df77addcbdeb5.zip | |
nixos/seahorse: move to programs
| -rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/seahorse.nix | 44 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/gnome3/seahorse.nix | 38 |
3 files changed, 45 insertions, 39 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 22fd5d7609df..2ca47441fa4f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -138,6 +138,7 @@ ./programs/qt5ct.nix ./programs/screen.nix ./programs/sedutil.nix + ./programs/seahorse.nix ./programs/slock.nix ./programs/shadow.nix ./programs/shell.nix @@ -301,7 +302,6 @@ ./services/desktops/gnome3/gnome-settings-daemon.nix ./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome3/rygel.nix - ./services/desktops/gnome3/seahorse.nix ./services/desktops/gnome3/sushi.nix ./services/desktops/gnome3/tracker.nix ./services/desktops/gnome3/tracker-miners.nix diff --git a/nixos/modules/programs/seahorse.nix b/nixos/modules/programs/seahorse.nix new file mode 100644 index 000000000000..c08b0a85374c --- /dev/null +++ b/nixos/modules/programs/seahorse.nix @@ -0,0 +1,44 @@ +# Seahorse. + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + # Added 2019-08-27 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "seahorse" "enable" ] + [ "programs" "seahorse" "enable" ]) + ]; + + + ###### interface + + options = { + + programs.seahorse = { + + enable = mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring"; + + }; + + }; + + + ###### implementation + + config = mkIf config.programs.seahorse.enable { + + environment.systemPackages = [ + pkgs.gnome3.seahorse + ]; + + services.dbus.packages = [ + pkgs.gnome3.seahorse + ]; + + }; + +} diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix deleted file mode 100644 index 9631157934f9..000000000000 --- a/nixos/modules/services/desktops/gnome3/seahorse.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Seahorse daemon. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - ###### interface - - options = { - - services.gnome3.seahorse = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Seahorse search provider for the GNOME Shell activity search. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.gnome3.seahorse.enable { - - environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ]; - - services.dbus.packages = [ pkgs.gnome3.seahorse ]; - - }; - -} |