aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2018-08-20 16:31:18 -0400
committerworldofpeace <worldofpeace@users.noreply.github.com>2019-01-24 20:54:14 +0000
commit78da8d668b51b10d12285483a661307e1d3052eb (patch)
treef24edb95d698d3c240dd1359a0957ec776b94912 /nixos
parent2530372351fb7c65df1e209356c5eabf5a66fa9e (diff)
pantheon: init a 5.0
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/module-list.nix3
-rw-r--r--nixos/modules/services/desktops/pantheon/contractor.nix39
-rw-r--r--nixos/modules/services/desktops/pantheon/files.nix36
-rw-r--r--nixos/modules/services/desktops/tumbler.nix50
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix195
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix47
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix1
-rw-r--r--nixos/release-combined.nix1
-rw-r--r--nixos/tests/pantheon.nix55
10 files changed, 428 insertions, 1 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1a8bd9cccb18..544b16bdf74d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -241,6 +241,8 @@
./services/desktops/bamf.nix
./services/desktops/dleyna-renderer.nix
./services/desktops/dleyna-server.nix
+ ./services/desktops/pantheon/contractor.nix
+ ./services/desktops/pantheon/files.nix
./services/desktops/flatpak.nix
./services/desktops/geoclue2.nix
./services/desktops/gsignond.nix
@@ -266,6 +268,7 @@
./services/desktops/gnome3/tracker-miners.nix
./services/desktops/profile-sync-daemon.nix
./services/desktops/telepathy.nix
+ ./services/desktops/tumbler.nix
./services/desktops/zeitgeist.nix
./services/development/bloop.nix
./services/development/hoogle.nix
diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixos/modules/services/desktops/pantheon/contractor.nix
new file mode 100644
index 000000000000..bd538db72413
--- /dev/null
+++ b/nixos/modules/services/desktops/pantheon/contractor.nix
@@ -0,0 +1,39 @@
+# Contractor
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+ ###### 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"
+ ];
+
+ };
+
+}
diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix
new file mode 100644
index 000000000000..2edbe5b3a6db
--- /dev/null
+++ b/nixos/modules/services/desktops/pantheon/files.nix
@@ -0,0 +1,36 @@
+# pantheon files daemon.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.pantheon.files = {
+
+ enable = mkEnableOption "pantheon files daemon";
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.services.pantheon.files.enable {
+
+ environment.systemPackages = [
+ pkgs.pantheon.elementary-files
+ ];
+
+ services.dbus.packages = [
+ pkgs.pantheon.elementary-files
+ ];
+
+ };
+
+}
diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix
new file mode 100644
index 000000000000..ccbb6d1434d9
--- /dev/null
+++ b/nixos/modules/services/desktops/tumbler.nix
@@ -0,0 +1,50 @@
+# Tumbler
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.tumbler;
+ tumbler = cfg.package;
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.tumbler = {
+
+ enable = mkEnableOption "Tumbler, A D-Bus thumbnailer service";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.xfce4-13.tumbler;
+ description = "Which tumbler package to use";
+ example = pkgs.xfce4-12.tumbler;
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [
+ tumbler
+ ];
+
+ services.dbus.packages = [
+ tumbler
+ ];
+
+ };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index cce35aa28ba8..2b1e9169e5f6 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -20,7 +20,7 @@ in
imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
- ./mate.nix
+ ./mate.nix ./pantheon.nix
];
options = {
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
new file mode 100644
index 000000000000..7e23dd9cde63
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -0,0 +1,195 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.xserver.desktopManager.pantheon;
+
+ nixos-gsettings-desktop-schemas = pkgs.pantheon.elementary-gsettings-schemas.override {
+ extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
+ extraGSettingsOverrides = cfg.extraGSettingsOverrides;
+ };
+
+in
+
+{
+ options = {
+
+ services.xserver.desktopManager.pantheon = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the pantheon desktop manager";
+ };
+
+ sessionPath = mkOption {
+ default = [];
+ example = literalExample "[ pkgs.gnome3.gpaste ]";
+ description = ''
+ Additional list of packages to be added to the session search path.
+ Useful for GSettings-conditional autostart.
+
+ Note that this should be a last resort; patching the package is preferred (see GPaste).
+ '';
+ apply = list: list ++
+ [
+ pkgs.pantheon.pantheon-agent-geoclue2
+ ];
+ };
+
+ extraGSettingsOverrides = mkOption {
+ default = "";
+ type = types.lines;
+ description = "Additional gsettings overrides.";
+ };
+
+ extraGSettingsOverridePackages = mkOption {
+ default = [];
+ type = types.listOf types.path;
+ description = "List of packages for which gsettings are overridden.";
+ };
+
+ debug = mkEnableOption "gnome-session debug messages";
+
+ };
+
+ environment.pantheon.excludePackages = mkOption {
+ default = [];
+ example = literalExample "[ pkgs.pantheon.elementary-camera ]";
+ type = types.listOf types.package;
+ description = "Which packages pantheon should exclude from the default environment";
+ };
+
+ };
+
+
+ config = mkIf cfg.enable {
+
+ services.xserver.displayManager.extraSessionFilePackages = [ 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
+ services.xserver.displayManager.lightdm.enable = mkDefault true;
+ services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
+
+ # If not set manually Pantheon session cannot be started
+ # Known issue of https://github.com/NixOS/nixpkgs/pull/43992
+ services.xserver.desktopManager.default = mkForce "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}
+
+ # Makes qt applications look less alien
+ export QT_QPA_PLATFORMTHEME=gtk3
+ export QT_STYLE_OVERRIDE=adwaita
+ fi
+ '';
+
+ 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.dbus.packages = mkMerge [
+ ([ pkgs.pantheon.switchboard-plug-power ])
+ (mkIf config.services.printing.enable ([pkgs.system-config-printer]) )
+ ];
+ services.pantheon.contractor.enable = 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;
+ # 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.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;
+
+ networking.networkmanager.enable = mkDefault true;
+ networking.networkmanager.basePackages =
+ { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
+ inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
+ networkmanager-openconnect networkmanager-fortisslvpn
+ networkmanager-iodine networkmanager-l2tp; };
+
+ # Override GSettings schemas
+ environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+
+ environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
+
+ environment.variables.GIO_EXTRA_MODULES = [
+ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
+ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
+ "${pkgs.gnome3.gvfs}/lib/gio/modules"
+ ];
+
+ 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
+ ++ (pkgs.gnome3.removePackagesByName pkgs.pantheon.apps config.environment.pantheon.excludePackages)
+ ++ (with pkgs.gnome3;
+ [
+ adwaita-icon-theme
+ dconf
+ epiphany
+ evince
+ file-roller
+ geary
+ gnome-bluetooth
+ gnome-font-viewer
+ gnome-power-manager
+ ])
+ ++ (with pkgs;
+ [
+ adwaita-qt
+ desktop-file-utils
+ glib
+ glib-networking
+ gnome-menus
+ gtk3.out
+ hicolor-icon-theme
+ lightlocker
+ plank
+ qgnomeplatform
+ shared-mime-info
+ sound-theme-freedesktop
+ xdg-user-dirs
+ ]);
+
+ fonts.fonts = with pkgs; [
+ opensans-ttf
+ roboto-mono
+ ];
+ fonts.fontconfig.defaultFonts = {
+ monospace = [ "Roboto Mono" ];
+ sansSerif = [ "Open Sans" ];
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
new file mode 100644
index 000000000000..05011b999f2b
--- /dev/null
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ dmcfg = config.services.xserver.displayManager;
+ ldmcfg = dmcfg.lightdm;
+ cfg = ldmcfg.greeters.pantheon;
+
+ xgreeters = pkgs.linkFarm "pantheon-greeter-xgreeters" [{
+ path = "${pkgs.pantheon.elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
+ name = "io.elementary.greeter.desktop";
+ }];
+
+in
+{
+ options = {
+
+ services.xserver.displayManager.lightdm.greeters.pantheon = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable elementary-greeter as the lightdm greeter.
+ '';
+ };
+
+ };
+
+ };
+
+ config = mkIf (ldmcfg.enable && cfg.enable) {
+
+ services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
+
+ services.xserver.displayManager.lightdm.greeter = mkDefault {
+ package = xgreeters;
+ name = "io.elementary.greeter";
+ };
+
+ environment.etc."lightdm/io.elementary.greeter.conf".source = "${pkgs.pantheon.elementary-greeter}/etc/lightdm/io.elementary.greeter.conf";
+ environment.etc."wingpanel.d/io.elementary.greeter.whitelist".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.whitelist";
+
+ };
+}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 567c3ac34549..3ab4f26399f3 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -81,6 +81,7 @@ in
./lightdm-greeters/gtk.nix
./lightdm-greeters/mini.nix
./lightdm-greeters/enso-os.nix
+ ./lightdm-greeters/pantheon.nix
];
options = {
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ea8b92e94f01..6c313f8dd3e4 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -68,6 +68,7 @@ in rec {
(all nixos.tests.firefox)
(all nixos.tests.firewall)
(except ["aarch64-linux"] nixos.tests.gnome3)
+ (except ["aarch64-linux"] nixos.tests.pantheon)
nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
(except ["aarch64-linux"] nixos.tests.installer.lvm)
(except ["aarch64-linux"] nixos.tests.installer.luksroot)
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
new file mode 100644
index 000000000000..c50f77f86173
--- /dev/null
+++ b/nixos/tests/pantheon.nix
@@ -0,0 +1,55 @@
+import ./make-test.nix ({ pkgs, ...} :
+
+{
+ name = "pantheon";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ worldofpeace ];
+ };
+
+ machine = { ... }:
+
+ {
+ imports = [ ./common/user-account.nix ];
+
+ services.xserver.enable = true;
+ services.xserver.desktopManager.pantheon.enable = true;
+
+ virtualisation.memorySize = 1024;
+ };
+
+ enableOCR = true;
+
+ testScript = { nodes, ... }: let
+ user = nodes.machine.config.users.users.alice;
+ in ''
+ startAll;
+
+ # Wait for display manager to start
+ $machine->waitForText(qr/${user.description}/);
+ $machine->screenshot("lightdm");
+
+ # Log in
+ $machine->sendChars("${user.password}\n");
+ $machine->waitForFile("/home/alice/.Xauthority");
+ $machine->succeed("xauth merge ~alice/.Xauthority");
+
+ # Check if "pantheon-shell" components actually start
+ $machine->waitUntilSucceeds("pgrep gala");
+ $machine->waitForWindow(qr/gala/);
+ $machine->waitUntilSucceeds("pgrep wingpanel");
+ $machine->waitForWindow("wingpanel");
+ $machine->waitUntilSucceeds("pgrep plank");
+ $machine->waitForWindow(qr/plank/);
+
+ # Check that logging in has given the user ownership of devices.
+ $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+
+ # Open elementary terminal
+ $machine->execute("su - alice -c 'DISPLAY=:0.0 io.elementary.terminal &'");
+ $machine->waitForWindow(qr/io.elementary.terminal/);
+
+ # Take a screenshot of the desktop
+ $machine->sleep(20);
+ $machine->screenshot("screen");
+ '';
+})