Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8a124a33ddc7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 038533614f6e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 15, 2019

  1. nixos/pantheon: cleanup systemPackages 

    We don't need gnome-bluetooth because its executables
path is already hardcoded into the contractor file, as that's
the only place it is needed.
Don't think we need gnome-power-manager either.

Also add programs like geary to removePackagesByName.

(cherry picked from commit c41a2d2)
    @worldofpeace
    worldofpeace committed Mar 15, 2019
    Copy the full SHA
    96d4808 View commit details

  2. nixos/pantheon: more mkDefault 

    (cherry picked from commit 36d4dba)
    @worldofpeace
    worldofpeace committed Mar 15, 2019
    Copy the full SHA
    0385336 View commit details
Showing with 16 additions and 17 deletions.
  1. +16 −17 nixos/modules/services/x11/desktop-managers/pantheon.nix
33 changes: 16 additions & 17 deletions nixos/modules/services/x11/desktop-managers/pantheon.nix
View file
Original file line number Diff line number Diff line change
@@ -108,25 +108,25 @@ in
([ pkgs.pantheon.switchboard-plug-power ])
(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;
# pantheon has pantheon-agent-geoclue2
services.geoclue2.enableDemoAgent = false;
services.gnome3.at-spi2-core.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
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gvfs.enable = true;
services.gnome3.rygel.enable = true;
services.gsignond.enable = true;
services.gnome3.rygel.enable = mkDefault true;
services.gsignond.enable = mkDefault true;
services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ];
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
services.xserver.libinput.enable = mkDefault true;
services.xserver.updateDbusEnvironment = true;
services.zeitgeist.enable = true;
services.zeitgeist.enable = mkDefault true;

networking.networkmanager.enable = mkDefault true;
networking.networkmanager.basePackages =
@@ -151,26 +151,24 @@ in
"/share"
];

environment.systemPackages = pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath
++ (pkgs.gnome3.removePackagesByName pkgs.pantheon.apps config.environment.pantheon.excludePackages)
++ (with pkgs.gnome3;
[
adwaita-icon-theme
dconf
epiphany
environment.systemPackages =
pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath
++ (with pkgs; gnome3.removePackagesByName
([
gnome3.geary
gnome3.epiphany
gnome3.gnome-font-viewer
evince
geary
gnome-bluetooth
gnome-font-viewer
gnome-power-manager
])
] ++ pantheon.apps) config.environment.pantheon.excludePackages)
++ (with pkgs;
[
adwaita-qt
desktop-file-utils
glib
glib-networking
gnome-menus
gnome3.adwaita-icon-theme
gnome3.dconf
gtk3.out
hicolor-icon-theme
lightlocker
@@ -186,6 +184,7 @@ in
roboto-mono
pantheon.elementary-redacted-script # needed by screenshot-tool
];

fonts.fontconfig.defaultFonts = {
monospace = [ "Roboto Mono" ];
sansSerif = [ "Open Sans" ];