b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/evince: move to programs

Browse source
This commit is contained in:
worldofpeace 2019-08-09 12:26:15 -04:00
parent acbee3c116
commit db69d2dfe7
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/module-list.nix
View file

@ -106,6 +106,7 @@
./programs/digitalbitbox/default.nix ./programs/digitalbitbox/default.nix
./programs/dmrconfig.nix ./programs/dmrconfig.nix
./programs/environment.nix ./programs/environment.nix
./programs/evince.nix
./programs/firejail.nix ./programs/firejail.nix
./programs/fish.nix ./programs/fish.nix
./programs/freetds.nix ./programs/freetds.nix
@ -280,7 +281,6 @@
./services/desktops/pipewire.nix ./services/desktops/pipewire.nix
./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/at-spi2-core.nix
./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/chrome-gnome-shell.nix
./services/desktops/gnome3/evince.nix
./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/evolution-data-server.nix
./services/desktops/gnome3/file-roller.nix ./services/desktops/gnome3/file-roller.nix
./services/desktops/gnome3/glib-networking.nix ./services/desktops/gnome3/glib-networking.nix

13
nixos/modules/services/desktops/gnome3/evince.nix → nixos/modules/programs/evince.nix
View file

@ -6,14 +6,21 @@ with lib;
{ {
# Added 2019-08-09
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "evince" "enable" ]
[ "programs" "evince" "enable" ])
];
###### interface ###### interface
options = { options = {
services.gnome3.evince = { programs.evince = {
enable = mkEnableOption enable = mkEnableOption
"systemd and dbus services for Evince, the GNOME document viewer"; "Evince, the GNOME document viewer";
}; };
@ -22,7 +29,7 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.evince.enable { config = mkIf config.programs.evince.enable {
environment.systemPackages = [ pkgs.evince ]; environment.systemPackages = [ pkgs.evince ];

4
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -123,7 +123,6 @@ in {
services.dleyna-renderer.enable = mkDefault true; services.dleyna-renderer.enable = mkDefault true;
services.dleyna-server.enable = mkDefault true; services.dleyna-server.enable = mkDefault true;
services.gnome3.at-spi2-core.enable = true; services.gnome3.at-spi2-core.enable = true;
services.gnome3.evince.enable = mkDefault true;
services.gnome3.evolution-data-server.enable = true; services.gnome3.evolution-data-server.enable = true;
services.gnome3.file-roller.enable = mkDefault true; services.gnome3.file-roller.enable = mkDefault true;
services.gnome3.glib-networking.enable = true; services.gnome3.glib-networking.enable = true;
@ -157,6 +156,9 @@ in {
xdg.portal.enable = true; xdg.portal.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; 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. # If gnome3 is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3"; nixpkgs.config.vim.gui = "gtk3";