dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #175620 from bobby285271/nixos-pantheon

Browse Source 
nixos/pantheon: make it possible to remove core packages
This commit is contained in:
Bobby Rong 2022-06-15 18:49:37 +08:00 committed by GitHub
commit 6d1779c567
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -50,10 +50,6 @@ in
Note that this should be a last resort; patching the package is preferred (see GPaste).
'';
apply = list: list ++
[
pkgs.pantheon.pantheon-agent-geoclue2
];
};
extraWingpanelIndicators = mkOption {
@ -96,6 +92,9 @@ in
config = mkMerge [
(mkIf cfg.enable {
services.xserver.desktopManager.pantheon.sessionPath = utils.removePackagesByName [
pkgs.pantheon.pantheon-agent-geoclue2
] config.environment.pantheon.excludePackages;
services.xserver.displayManager.sessionPackages = [ pkgs.pantheon.elementary-session-settings ];
@ -177,19 +176,28 @@ in
networking.networkmanager.enable = mkDefault true;
# Global environment
environment.systemPackages = with pkgs; [
environment.systemPackages = (with pkgs.pantheon; [
elementary-session-settings
elementary-settings-daemon
gala
gnome-settings-daemon
(switchboard-with-plugs.override {
plugs = cfg.extraSwitchboardPlugs;
})
(wingpanel-with-indicators.override {
indicators = cfg.extraWingpanelIndicators;
})
]) ++ utils.removePackagesByName ((with pkgs; [
desktop-file-utils
glib
glib # for gsettings program
gnome-menus
gnome.adwaita-icon-theme
gtk3.out
hicolor-icon-theme
gtk3.out # for gtk-launch program
onboard
qgnomeplatform
shared-mime-info
sound-theme-freedesktop
xdg-user-dirs
] ++ (with pkgs.pantheon; [
xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
]) ++ (with pkgs.pantheon; [
# Artwork
elementary-gtk-theme
elementary-icon-theme
@ -199,31 +207,21 @@ in
# Desktop
elementary-default-settings
elementary-dock
elementary-session-settings
elementary-shortcut-overlay
gala
(switchboard-with-plugs.override {
plugs = cfg.extraSwitchboardPlugs;
})
(wingpanel-with-indicators.override {
indicators = cfg.extraWingpanelIndicators;
})
# Services
elementary-capnet-assist
elementary-notifications
elementary-settings-daemon
gnome-settings-daemon
pantheon-agent-geoclue2
pantheon-agent-polkit
]);
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
])) config.environment.pantheon.excludePackages;
# Settings from elementary-default-settings
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
xdg.mime.enable = true;
xdg.icons.enable = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = with pkgs.pantheon; [
elementary-files
@ -271,6 +269,9 @@ in
})
(mkIf serviceCfg.apps.enable {
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
environment.systemPackages = utils.removePackagesByName ([
pkgs.gnome.gnome-font-viewer
] ++ (with pkgs.pantheon; [