Merge pull request #76116 from worldofpeace/pantheon-cleanup
Pantheon cleanups
This commit is contained in:
worldofpeace
GitHub
commit
35b7b17125
|
|
@ -6,35 +6,12 @@ with lib;
|
|||
|
||||
{
|
||||
|
||||
meta.maintainers = pkgs.pantheon.maintainers;
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.pantheon.contractor = {
|
||||
|
||||
enable = mkEnableOption "contractor, a desktop-wide extension service used by pantheon";
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.pantheon.contractor.enable {
|
||||
|
||||
environment.systemPackages = with pkgs.pantheon; [
|
||||
contractor
|
||||
extra-elementary-contracts
|
||||
];
|
||||
|
||||
services.dbus.packages = [ pkgs.pantheon.contractor ];
|
||||
|
||||
environment.pathsToLink = [
|
||||
"/share/contractor"
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,33 +6,8 @@ with lib;
|
|||
|
||||
{
|
||||
|
||||
meta.maintainers = pkgs.pantheon.maintainers;
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.pantheon.files = {
|
||||
|
||||
enable = mkEnableOption "pantheon files daemon";
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.pantheon.files.enable {
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.pantheon.elementary-files
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`")
|
||||
];
|
||||
|
||||
services.dbus.packages = [
|
||||
pkgs.pantheon.elementary-files
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ with lib;
|
|||
let
|
||||
|
||||
cfg = config.services.xserver.desktopManager.pantheon;
|
||||
serviceCfg = config.services.pantheon;
|
||||
|
||||
nixos-gsettings-desktop-schemas = pkgs.pantheon.elementary-gsettings-schemas.override {
|
||||
extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
|
||||
|
|
@ -19,6 +20,16 @@ in
|
|||
|
||||
options = {
|
||||
|
||||
services.pantheon = {
|
||||
|
||||
contractor = {
|
||||
enable = mkEnableOption "contractor, a desktop-wide extension service used by Pantheon";
|
||||
};
|
||||
|
||||
apps.enable = mkEnableOption "Pantheon default applications";
|
||||
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.pantheon = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -41,6 +52,18 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
extraWingpanelIndicators = mkOption {
|
||||
default = null;
|
||||
type = with types; nullOr (listOf package);
|
||||
description = "Indicators to add to Wingpanel.";
|
||||
};
|
||||
|
||||
extraSwitchboardPlugs = mkOption {
|
||||
default = null;
|
||||
type = with types; nullOr (listOf package);
|
||||
description = "Plugs to add to Switchboard.";
|
||||
};
|
||||
|
||||
extraGSettingsOverrides = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
|
|
@ -67,13 +90,13 @@ in
|
|||
};
|
||||
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = mkMerge [
|
||||
(mkIf cfg.enable {
|
||||
|
||||
services.xserver.displayManager.sessionPackages = [ pkgs.pantheon.elementary-session-settings ];
|
||||
|
||||
# Ensure lightdm is used when Pantheon is enabled
|
||||
# Without it screen locking will be nonfunctional because of the use of lightlocker
|
||||
|
||||
warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
|
||||
''
|
||||
Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
|
||||
|
|
@ -81,7 +104,7 @@ in
|
|||
|
||||
services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
|
||||
|
||||
# Without this, Elementary LightDM greeter will pre-select non-existent `default` session
|
||||
# Without this, elementary LightDM greeter will pre-select non-existent `default` session
|
||||
# https://github.com/elementary/greeter/issues/368
|
||||
services.xserver.displayManager.defaultSession = "pantheon";
|
||||
|
||||
|
|
@ -100,27 +123,25 @@ in
|
|||
fi
|
||||
'';
|
||||
|
||||
# Default services
|
||||
hardware.bluetooth.enable = mkDefault true;
|
||||
hardware.pulseaudio.enable = mkDefault true;
|
||||
security.polkit.enable = true;
|
||||
services.accounts-daemon.enable = true;
|
||||
services.bamf.enable = true;
|
||||
services.colord.enable = mkDefault true;
|
||||
services.pantheon.files.enable = mkDefault true;
|
||||
services.tumbler.enable = mkDefault true;
|
||||
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
|
||||
services.dbus.packages = with pkgs.pantheon; [
|
||||
switchboard-plug-power
|
||||
elementary-default-settings
|
||||
elementary-default-settings # accountsservice extensions
|
||||
];
|
||||
services.pantheon.apps.enable = mkDefault true;
|
||||
services.pantheon.contractor.enable = mkDefault true;
|
||||
services.gnome3.at-spi2-core.enable = true;
|
||||
services.gnome3.evolution-data-server.enable = true;
|
||||
services.gnome3.glib-networking.enable = 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.gnome-settings-daemon.enable = true;
|
||||
services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ];
|
||||
services.gvfs.enable = true;
|
||||
services.gnome3.rygel.enable = mkDefault true;
|
||||
services.gsignond.enable = mkDefault true;
|
||||
|
|
@ -137,10 +158,81 @@ in
|
|||
isAllowed = true;
|
||||
isSystem = true;
|
||||
};
|
||||
|
||||
# Use gnome-settings-daemon fork
|
||||
services.udev.packages = [
|
||||
pkgs.pantheon.elementary-settings-daemon
|
||||
];
|
||||
systemd.packages = [
|
||||
pkgs.pantheon.elementary-settings-daemon
|
||||
];
|
||||
programs.dconf.enable = true;
|
||||
networking.networkmanager.enable = mkDefault true;
|
||||
|
||||
# Global environment
|
||||
environment.systemPackages = with pkgs; [
|
||||
desktop-file-utils
|
||||
glib
|
||||
gnome-menus
|
||||
gnome3.adwaita-icon-theme
|
||||
gtk3.out
|
||||
hicolor-icon-theme
|
||||
lightlocker
|
||||
onboard
|
||||
plank
|
||||
qgnomeplatform
|
||||
shared-mime-info
|
||||
sound-theme-freedesktop
|
||||
xdg-user-dirs
|
||||
] ++ (with pkgs.pantheon; [
|
||||
# Artwork
|
||||
elementary-gtk-theme
|
||||
elementary-icon-theme
|
||||
elementary-sound-theme
|
||||
elementary-wallpapers
|
||||
|
||||
# Desktop
|
||||
elementary-default-settings
|
||||
elementary-session-settings
|
||||
elementary-shortcut-overlay
|
||||
gala
|
||||
(switchboard-with-plugs.override {
|
||||
plugs = cfg.extraSwitchboardPlugs;
|
||||
})
|
||||
(wingpanel-with-indicators.override {
|
||||
indicators = cfg.extraWingpanelIndicators;
|
||||
})
|
||||
|
||||
# Services
|
||||
cerbere
|
||||
elementary-capnet-assist
|
||||
elementary-dpms-helper
|
||||
elementary-settings-daemon
|
||||
pantheon-agent-geoclue2
|
||||
pantheon-agent-polkit
|
||||
]) ++ (gnome3.removePackagesByName [
|
||||
gnome3.geary
|
||||
gnome3.epiphany
|
||||
gnome3.gnome-font-viewer
|
||||
] config.environment.pantheon.excludePackages);
|
||||
|
||||
programs.evince.enable = mkDefault true;
|
||||
programs.file-roller.enable = mkDefault true;
|
||||
|
||||
# Settings from elementary-default-settings
|
||||
environment.sessionVariables.GTK_CSD = "1";
|
||||
environment.sessionVariables.GTK3_MODULES = [ "pantheon-filechooser-module" ];
|
||||
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
||||
|
||||
# Override GSettings schemas
|
||||
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
|
||||
|
||||
environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
|
||||
|
||||
environment.pathsToLink = [
|
||||
# FIXME: modules should link subdirs of `/share` rather than relying on this
|
||||
"/share"
|
||||
];
|
||||
|
||||
# Otherwise you can't store NetworkManager Secrets with
|
||||
# "Store the password only for this user"
|
||||
programs.nm-applet.enable = true;
|
||||
|
|
@ -154,61 +246,48 @@ in
|
|||
qt5.platformTheme = "gnome";
|
||||
qt5.style = "adwaita";
|
||||
|
||||
networking.networkmanager.enable = mkDefault true;
|
||||
|
||||
# Override GSettings schemas
|
||||
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
|
||||
|
||||
environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
|
||||
|
||||
# Settings from elementary-default-settings
|
||||
environment.sessionVariables.GTK_CSD = "1";
|
||||
environment.sessionVariables.GTK3_MODULES = [ "pantheon-filechooser-module" ];
|
||||
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
||||
|
||||
environment.pathsToLink = [
|
||||
# FIXME: modules should link subdirs of `/share` rather than relying on this
|
||||
"/share"
|
||||
];
|
||||
|
||||
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
|
||||
] ++ pantheon.apps) config.environment.pantheon.excludePackages)
|
||||
++ (with pkgs;
|
||||
[
|
||||
adwaita-qt
|
||||
desktop-file-utils
|
||||
glib
|
||||
glib-networking
|
||||
gnome-menus
|
||||
gnome3.adwaita-icon-theme
|
||||
gtk3.out
|
||||
hicolor-icon-theme
|
||||
lightlocker
|
||||
onboard
|
||||
plank
|
||||
qgnomeplatform
|
||||
shared-mime-info
|
||||
sound-theme-freedesktop
|
||||
xdg-user-dirs
|
||||
]);
|
||||
|
||||
# Default Fonts
|
||||
fonts.fonts = with pkgs; [
|
||||
open-sans
|
||||
roboto-mono
|
||||
pantheon.elementary-redacted-script # needed by screenshot-tool
|
||||
];
|
||||
|
||||
fonts.fontconfig.defaultFonts = {
|
||||
monospace = [ "Roboto Mono" ];
|
||||
sansSerif = [ "Open Sans" ];
|
||||
};
|
||||
})
|
||||
|
||||
};
|
||||
(mkIf serviceCfg.apps.enable {
|
||||
environment.systemPackages = (with pkgs.pantheon; pkgs.gnome3.removePackagesByName [
|
||||
elementary-calculator
|
||||
elementary-calendar
|
||||
elementary-camera
|
||||
elementary-code
|
||||
elementary-files
|
||||
elementary-music
|
||||
elementary-photos
|
||||
elementary-screenshot-tool
|
||||
elementary-terminal
|
||||
elementary-videos
|
||||
] config.environment.pantheon.excludePackages);
|
||||
|
||||
# needed by screenshot-tool
|
||||
fonts.fonts = [
|
||||
pkgs.pantheon.elementary-redacted-script
|
||||
];
|
||||
})
|
||||
|
||||
(mkIf serviceCfg.contractor.enable {
|
||||
environment.systemPackages = with pkgs.pantheon; [
|
||||
contractor
|
||||
extra-elementary-contracts
|
||||
];
|
||||
|
||||
environment.pathsToLink = [
|
||||
"/share/contractor"
|
||||
];
|
||||
})
|
||||
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,10 +5,14 @@
|
|||
, switchboard
|
||||
, switchboardPlugs
|
||||
, plugs
|
||||
# Only useful to disable for development testing.
|
||||
, useDefaultPlugs ? true
|
||||
}:
|
||||
|
||||
let
|
||||
selectedPlugs = if plugs == null then switchboardPlugs else plugs;
|
||||
selectedPlugs =
|
||||
if plugs == null then switchboardPlugs
|
||||
else plugs ++ (lib.optional useDefaultPlugs switchboardPlugs);
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "${switchboard.name}-with-plugs";
|
||||
|
|
|
|||
|
|
@ -3,37 +3,6 @@
|
|||
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
apps = [
|
||||
elementary-calculator elementary-calendar
|
||||
elementary-camera elementary-code elementary-files
|
||||
elementary-music elementary-photos elementary-screenshot-tool
|
||||
elementary-terminal elementary-videos switchboard-with-plugs
|
||||
];
|
||||
|
||||
artwork = [
|
||||
elementary-gtk-theme
|
||||
elementary-icon-theme
|
||||
elementary-sound-theme
|
||||
elementary-wallpapers
|
||||
];
|
||||
|
||||
desktop = [
|
||||
elementary-default-settings
|
||||
elementary-session-settings
|
||||
elementary-shortcut-overlay
|
||||
gala
|
||||
wingpanel-with-indicators
|
||||
];
|
||||
|
||||
services = [
|
||||
cerbere
|
||||
elementary-capnet-assist
|
||||
elementary-settings-daemon
|
||||
elementary-dpms-helper
|
||||
pantheon-agent-geoclue2
|
||||
pantheon-agent-polkit
|
||||
];
|
||||
|
||||
switchboardPlugs = [
|
||||
switchboard-plug-a11y switchboard-plug-about
|
||||
switchboard-plug-applications switchboard-plug-bluetooth
|
||||
|
|
|
|||
|
|
@ -6,10 +6,14 @@
|
|||
, wingpanelIndicators
|
||||
, switchboard-with-plugs
|
||||
, indicators ? null
|
||||
# Only useful to disable for development testing.
|
||||
, useDefaultIndicators ? true
|
||||
}:
|
||||
|
||||
let
|
||||
selectedIndicators = if indicators == null then wingpanelIndicators else indicators;
|
||||
selectedIndicators =
|
||||
if indicators == null then wingpanelIndicators
|
||||
else indicators ++ (lib.optional useDefaultIndicators wingpanelIndicators);
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "${wingpanel.name}-with-indicators";
|
||||
|
|
|
|||
Loading…
Reference in New Issue