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

nixos/gnome-disks: move to programs

Browse source
This commit is contained in:
worldofpeace 2019-08-09 12:33:49 -04:00
parent ff0e3aae35
commit 6c525b1076
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,6 +111,7 @@
./programs/firejail.nix ./programs/firejail.nix
./programs/fish.nix ./programs/fish.nix
./programs/freetds.nix ./programs/freetds.nix
./programs/gnome-disks.nix
./programs/gnupg.nix ./programs/gnupg.nix
./programs/gphoto2.nix ./programs/gphoto2.nix
./programs/iftop.nix ./programs/iftop.nix
@ -284,7 +285,6 @@
./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/chrome-gnome-shell.nix
./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/evolution-data-server.nix
./services/desktops/gnome3/glib-networking.nix ./services/desktops/gnome3/glib-networking.nix
./services/desktops/gnome3/gnome-disks.nix
./services/desktops/gnome3/gnome-documents.nix ./services/desktops/gnome3/gnome-documents.nix
./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix ./services/desktops/gnome3/gnome-online-accounts.nix

15
nixos/modules/services/desktops/gnome3/gnome-disks.nix → nixos/modules/programs/gnome-disks.nix
View file

@ -1,4 +1,4 @@
# GNOME Disks daemon. # GNOME Disks.
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
@ -6,17 +6,24 @@ with lib;
{ {
# Added 2019-08-09
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-disks" "enable" ]
[ "programs" "gnome-disks" "enable" ])
];
###### interface ###### interface
options = { options = {
services.gnome3.gnome-disks = { programs.gnome-disks = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = '' description = ''
Whether to enable GNOME Disks daemon, a service designed to Whether to enable GNOME Disks daemon, a program designed to
be a UDisks2 graphical front-end. be a UDisks2 graphical front-end.
''; '';
}; };
@ -28,7 +35,7 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.gnome-disks.enable { config = mkIf config.programs.gnome-disks.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ]; environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ];

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

@ -125,7 +125,6 @@ in {
services.gnome3.at-spi2-core.enable = true; services.gnome3.at-spi2-core.enable = true;
services.gnome3.evolution-data-server.enable = true; services.gnome3.evolution-data-server.enable = true;
services.gnome3.glib-networking.enable = true; services.gnome3.glib-networking.enable = true;
services.gnome3.gnome-disks.enable = mkDefault true;
services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-documents.enable = mkDefault true;
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = mkDefault true; services.gnome3.gnome-online-accounts.enable = mkDefault true;
@ -158,6 +157,7 @@ in {
# Enable default programs # Enable default programs
programs.evince.enable = mkDefault true; programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true; programs.file-roller.enable = mkDefault true;
programs.gnome-disks.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";