forked from mirrors/nixpkgs
nixos/pantheon: move contractor module into xservice
This commit is contained in:
worldofpeace
parent
1ec2b545dd
commit
ee75a460af
|
|
@ -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
|
###### implementation
|
||||||
|
|
||||||
config = mkIf config.services.pantheon.contractor.enable {
|
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"
|
|
||||||
];
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ with lib;
|
||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.services.xserver.desktopManager.pantheon;
|
cfg = config.services.xserver.desktopManager.pantheon;
|
||||||
|
serviceCfg = config.services.pantheon;
|
||||||
|
|
||||||
nixos-gsettings-desktop-schemas = pkgs.pantheon.elementary-gsettings-schemas.override {
|
nixos-gsettings-desktop-schemas = pkgs.pantheon.elementary-gsettings-schemas.override {
|
||||||
extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
|
extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
|
||||||
|
|
@ -19,6 +20,14 @@ in
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
services.pantheon = {
|
||||||
|
|
||||||
|
contractor = {
|
||||||
|
enable = mkEnableOption "contractor, a desktop-wide extension service used by Pantheon";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
services.xserver.desktopManager.pantheon = {
|
services.xserver.desktopManager.pantheon = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
|
@ -67,147 +76,158 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkMerge [
|
||||||
|
(mkIf cfg.enable {
|
||||||
|
|
||||||
services.xserver.displayManager.sessionPackages = [ pkgs.pantheon.elementary-session-settings ];
|
services.xserver.displayManager.sessionPackages = [ pkgs.pantheon.elementary-session-settings ];
|
||||||
|
|
||||||
# Ensure lightdm is used when Pantheon is enabled
|
# Ensure lightdm is used when Pantheon is enabled
|
||||||
# Without it screen locking will be nonfunctional because of the use of lightlocker
|
# 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.
|
||||||
|
'';
|
||||||
|
|
||||||
warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
|
services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
|
||||||
''
|
|
||||||
Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
|
# Without this, elementary LightDM greeter will pre-select non-existent `default` session
|
||||||
|
# https://github.com/elementary/greeter/issues/368
|
||||||
|
services.xserver.displayManager.defaultSession = "pantheon";
|
||||||
|
|
||||||
|
services.xserver.displayManager.sessionCommands = ''
|
||||||
|
if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then
|
||||||
|
${concatMapStrings (p: ''
|
||||||
|
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
|
||||||
|
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -d "${p}/lib/girepository-1.0" ]; then
|
||||||
|
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
|
||||||
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
|
||||||
|
fi
|
||||||
|
'') cfg.sessionPath}
|
||||||
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
|
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.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
|
||||||
|
];
|
||||||
|
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;
|
||||||
|
services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
|
||||||
|
services.udisks2.enable = true;
|
||||||
|
services.upower.enable = config.powerManagement.enable;
|
||||||
|
services.xserver.libinput.enable = mkDefault true;
|
||||||
|
services.xserver.updateDbusEnvironment = true;
|
||||||
|
services.zeitgeist.enable = mkDefault true;
|
||||||
|
services.geoclue2.enable = mkDefault true;
|
||||||
|
# pantheon has pantheon-agent-geoclue2
|
||||||
|
services.geoclue2.enableDemoAgent = false;
|
||||||
|
services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = {
|
||||||
|
isAllowed = true;
|
||||||
|
isSystem = true;
|
||||||
|
};
|
||||||
|
|
||||||
# Without this, Elementary LightDM greeter will pre-select non-existent `default` session
|
programs.dconf.enable = true;
|
||||||
# https://github.com/elementary/greeter/issues/368
|
programs.evince.enable = mkDefault true;
|
||||||
services.xserver.displayManager.defaultSession = "pantheon";
|
programs.file-roller.enable = mkDefault true;
|
||||||
|
# Otherwise you can't store NetworkManager Secrets with
|
||||||
|
# "Store the password only for this user"
|
||||||
|
programs.nm-applet.enable = true;
|
||||||
|
|
||||||
services.xserver.displayManager.sessionCommands = ''
|
# Shell integration for VTE terminals
|
||||||
if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then
|
programs.bash.vteIntegration = mkDefault true;
|
||||||
${concatMapStrings (p: ''
|
programs.zsh.vteIntegration = mkDefault true;
|
||||||
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
|
|
||||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -d "${p}/lib/girepository-1.0" ]; then
|
# Harmonize Qt5 applications under Pantheon
|
||||||
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
|
qt5.enable = true;
|
||||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
|
qt5.platformTheme = "gnome";
|
||||||
fi
|
qt5.style = "adwaita";
|
||||||
'') cfg.sessionPath}
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
hardware.bluetooth.enable = mkDefault true;
|
networking.networkmanager.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.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
|
|
||||||
];
|
|
||||||
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;
|
|
||||||
services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
|
|
||||||
services.udisks2.enable = true;
|
|
||||||
services.upower.enable = config.powerManagement.enable;
|
|
||||||
services.xserver.libinput.enable = mkDefault true;
|
|
||||||
services.xserver.updateDbusEnvironment = true;
|
|
||||||
services.zeitgeist.enable = mkDefault true;
|
|
||||||
services.geoclue2.enable = mkDefault true;
|
|
||||||
# pantheon has pantheon-agent-geoclue2
|
|
||||||
services.geoclue2.enableDemoAgent = false;
|
|
||||||
services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = {
|
|
||||||
isAllowed = true;
|
|
||||||
isSystem = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
# Override GSettings schemas
|
||||||
programs.evince.enable = mkDefault true;
|
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
|
||||||
programs.file-roller.enable = mkDefault true;
|
|
||||||
# Otherwise you can't store NetworkManager Secrets with
|
|
||||||
# "Store the password only for this user"
|
|
||||||
programs.nm-applet.enable = true;
|
|
||||||
|
|
||||||
# Shell integration for VTE terminals
|
environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
|
||||||
programs.bash.vteIntegration = mkDefault true;
|
|
||||||
programs.zsh.vteIntegration = mkDefault true;
|
|
||||||
|
|
||||||
# Harmonize Qt5 applications under Pantheon
|
# Settings from elementary-default-settings
|
||||||
qt5.enable = true;
|
environment.sessionVariables.GTK_CSD = "1";
|
||||||
qt5.platformTheme = "gnome";
|
environment.sessionVariables.GTK3_MODULES = [ "pantheon-filechooser-module" ];
|
||||||
qt5.style = "adwaita";
|
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
||||||
|
|
||||||
networking.networkmanager.enable = mkDefault true;
|
environment.pathsToLink = [
|
||||||
|
# FIXME: modules should link subdirs of `/share` rather than relying on this
|
||||||
|
"/share"
|
||||||
|
];
|
||||||
|
|
||||||
# Override GSettings schemas
|
environment.systemPackages =
|
||||||
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
|
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
|
||||||
|
]);
|
||||||
|
|
||||||
environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
|
fonts.fonts = with pkgs; [
|
||||||
|
open-sans
|
||||||
|
roboto-mono
|
||||||
|
pantheon.elementary-redacted-script # needed by screenshot-tool
|
||||||
|
];
|
||||||
|
|
||||||
# Settings from elementary-default-settings
|
fonts.fontconfig.defaultFonts = {
|
||||||
environment.sessionVariables.GTK_CSD = "1";
|
monospace = [ "Roboto Mono" ];
|
||||||
environment.sessionVariables.GTK3_MODULES = [ "pantheon-filechooser-module" ];
|
sansSerif = [ "Open Sans" ];
|
||||||
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
};
|
||||||
|
})
|
||||||
|
|
||||||
environment.pathsToLink = [
|
(mkIf serviceCfg.contractor.enable {
|
||||||
# FIXME: modules should link subdirs of `/share` rather than relying on this
|
environment.systemPackages = with pkgs.pantheon; [
|
||||||
"/share"
|
contractor
|
||||||
];
|
extra-elementary-contracts
|
||||||
|
];
|
||||||
|
|
||||||
environment.systemPackages =
|
environment.pathsToLink = [
|
||||||
pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath
|
"/share/contractor"
|
||||||
++ (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
|
|
||||||
]);
|
|
||||||
|
|
||||||
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" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue