BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #57174 from worldofpeace/pantheon/cleanup

Browse source 
nixos/pantheon cleanup
This commit is contained in:
Silvan Mosberger 2019-03-15 01:26:49 +01:00 committed by GitHub
commit fb879ae920
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
nixos/modules/services/x11/desktop-managers/pantheon.nix
View file

@ -108,26 +108,26 @@ in
([ pkgs.pantheon.switchboard-plug-power ]) ([ pkgs.pantheon.switchboard-plug-power ])
(mkIf config.services.printing.enable ([pkgs.system-config-printer]) ) (mkIf config.services.printing.enable ([pkgs.system-config-printer]) )
]; ];
services.pantheon.contractor.enable = true; services.pantheon.contractor.enable = mkDefault true;
services.geoclue2.enable = mkDefault true; services.geoclue2.enable = mkDefault true;
# pantheon has pantheon-agent-geoclue2 # pantheon has pantheon-agent-geoclue2
services.geoclue2.enableDemoAgent = false; services.geoclue2.enableDemoAgent = false;
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.file-roller.enable = true; services.gnome3.file-roller.enable = mkDefault true;
# TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon; services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon;
services.gnome3.gvfs.enable = true; services.gnome3.gvfs.enable = true;
services.gnome3.rygel.enable = true; services.gnome3.rygel.enable = mkDefault true;
services.gsignond.enable = true; services.gsignond.enable = mkDefault true;
services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ]; services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
services.udisks2.enable = true; services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable; services.upower.enable = config.powerManagement.enable;
services.xserver.libinput.enable = mkDefault true; services.xserver.libinput.enable = mkDefault true;
services.xserver.updateDbusEnvironment = true; services.xserver.updateDbusEnvironment = true;
services.zeitgeist.enable = true; services.zeitgeist.enable = mkDefault true;
networking.networkmanager.enable = mkDefault true; networking.networkmanager.enable = mkDefault true;
networking.networkmanager.basePackages = networking.networkmanager.basePackages =
@ -152,19 +152,15 @@ in
"/share" "/share"
]; ];
environment.systemPackages = pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath environment.systemPackages =
++ (pkgs.gnome3.removePackagesByName pkgs.pantheon.apps config.environment.pantheon.excludePackages) pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath
++ (with pkgs.gnome3; ++ (with pkgs; gnome3.removePackagesByName
[ ([
adwaita-icon-theme gnome3.geary
dconf gnome3.epiphany
epiphany gnome3.gnome-font-viewer
evince evince
geary ] ++ pantheon.apps) config.environment.pantheon.excludePackages)
gnome-bluetooth
gnome-font-viewer
gnome-power-manager
])
++ (with pkgs; ++ (with pkgs;
[ [
adwaita-qt adwaita-qt
@ -172,6 +168,8 @@ in
glib glib
glib-networking glib-networking
gnome-menus gnome-menus
gnome3.adwaita-icon-theme
gnome3.dconf
gtk3.out gtk3.out
hicolor-icon-theme hicolor-icon-theme
lightlocker lightlocker
@ -187,6 +185,7 @@ in
roboto-mono roboto-mono
pantheon.elementary-redacted-script # needed by screenshot-tool pantheon.elementary-redacted-script # needed by screenshot-tool
]; ];
fonts.fontconfig.defaultFonts = { fonts.fontconfig.defaultFonts = {
monospace = [ "Roboto Mono" ]; monospace = [ "Roboto Mono" ];
sansSerif = [ "Open Sans" ]; sansSerif = [ "Open Sans" ];