Commit Graph

437 Commits

Author SHA1 Message Date
Jan Tojnar
d5060ac3a7
Merge pull request #33371 from jtojnar/flatpak
Flatpak
2018-05-15 14:19:33 +02:00
Jan Tojnar
ec80c5e4c4
nixos/flatpak: allow specifying extra portals 2018-05-15 13:31:13 +02:00
Jan Malakhovski
44d612d6e5 nixos: services.xserver.desktopManager.xterm.enable: fix type 2018-05-13 01:15:23 +00:00
Tim Engler
d488a9dc7a nixos/lxqt: enable upower if config.powerManagement is enabled (#38318) 2018-04-06 08:49:55 +01:00
Johannes Lötzsch
1ab3736146 mate/mate-screensaver: fixed unixAuth
Without this fix, it's not possible to unlock the mate-screensaver.
2018-04-01 19:01:26 +02:00
Maximilian Bosch
5caa22fe0a Revert restrictive validation behavior for DM/WM defaults in the X module
The original idea behind this change (described in ticket #11064) was to
improve the assertions to avoid that users of the X server accidentally
forget to configure a DM or WM.

However this caused several issues with setups that require X, but no DM
or WM. The keymap testcases became instable as well as now disabling DMs
needs to be done explicitly.
(see https://github.com/NixOS/nixpkgs/pull/31268#issuecomment-347080036)

In the end the idea behind the change and #11064 was obviously a
mistake, so reverting it completely for now should be fine.
2018-03-28 20:34:05 +02:00
Florian Klink
6ac74d60ad networkmanager-pptp: remove package
Currently broken on NixOS due to hardcoded modprobe binary path (see
bug #30756 from Oct 2017), no activity on a proposed fix for months.
As the protocol is terribly broken anyways, let's better remove it
completely, and not talk about anymore ;-)

Closes #30756.
2018-03-23 22:24:50 +01:00
Tuomas Tynkkynen
1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Jan Tojnar
618ac29687
cantarell-fonts: rename from cantarell_fonts 2018-03-03 00:36:38 +01:00
Shea Levy
fec543436d
nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
adisbladis
1de98e8568
plasma: 5.11.5 -> 5.12.1 2018-02-14 17:24:20 +08:00
Thomas Tuegel
77a607aa88
nixos/plasma5: Fix font style names in kdeglobals 2018-02-04 13:31:04 -06:00
Vladimír Čunát
5402412b97
Merge #33600: xfce: cleanup, hyphenate attributes 2018-01-21 09:52:58 +01:00
José Romildo Malaquias
8b416450ea mate: let caja find extensions and gsettings schemas 2018-01-09 02:40:04 +02:00
José Romildo Malaquias
598c6c13f0 mate-panel: let mate-panel find applets in config system path 2018-01-09 02:40:04 +02:00
José Romildo Malaquias
ca27392d9c mate-control-center: add gsettings schemas path to XDG vars
mate-control-center depends on mate-settings-daemon, but the later needs
gsettings schemas  provided by the former. To fix this the gsettings schema
path from mate-control-center is added to XDG_DATA_DIRS at session
startup.
2018-01-09 02:40:04 +02:00
José Romildo Malaquias
1bacb88c6a mate-session-manager: add debug option to mate service 2018-01-09 02:40:04 +02:00
Yegor Timoshenko
f7a9f96725
nixos/xfce: clean up, use hyphenated attributes 2018-01-08 05:12:05 +00:00
Yegor Timoshenko
0dd6bd214d
xfce: resolve conflict with KDE
This resolves some aspects of #33231, but GDK_PIXBUF_MODULE_FILE doesn't really belong to any DE module.
2017-12-31 05:22:15 +00:00
adisbladis
563078184e
services.xserver.desktopManager.plasma5: add qtvirtualkeyboard to systemPackages 2017-12-28 21:13:46 +08:00
Peter Hoeg
7798051817
Merge pull request #32927 from peterhoeg/u/kdeapp
kde-applications: 17.08.3 -> 17.12.0
2017-12-28 08:22:27 +08:00
José Romildo Malaquias
6e0387a1e6 mate: fix XDG_MENU_PREFIX 2017-12-25 07:15:07 +01:00
José Romildo Malaquias
248e3983b0 gnome3: fix XDG_MENU_PREFIX 2017-12-25 07:15:07 +01:00
José Romildo Malaquias
1e147fee02 enlightenment: fix XDG_MENU_PREFIX 2017-12-25 07:15:07 +01:00
gnidorah
22596e8995 breeze-qt4: drop 2017-12-24 12:54:04 +03:00
Yegor Timoshenko
71a8dbb956 nixos/desktop-managers: do not leak feh to PATH
(originally from f9415cb621)

feh is used to set background image for desktop managers that do not
support it directly, however there is no need to include it in PATH.

Fixes #17450.
2017-12-21 01:43:38 +00:00
Wei Tang
62a974bbbf xfce: delay package selection for pulseaudio volume to nixos modules (#23382)
Now there are separate `xfce4.xfce4mixer_pulse` and `xfce4.xfcevolumed_pulse` attributes for PulseAudio versions of these packages, instead of relying on Nixpkgs option. Mind that xfce4-volumed and xfce4-volumed-pulse are actually two separate programs without much overlap.
2017-12-19 22:28:12 +03:00
Yegor Timoshenko
209cbf9fc7 xfce: SVG icon support in xfce4-panel, fixes #18536
Thanks to Yuriy Pitomets, Jonathan Curran, and David Kleuker.
2017-12-18 01:11:20 +00:00
Michael Peyton Jones
638d24950d plymouth: add breeze-plymouth as default theme 2017-12-11 20:42:00 +00:00
Vladimír Čunát
6345089ca0
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
2017-11-27 12:19:01 +01:00
Vladimír Čunát
337e900c3d
Merge #31683: glib: Add variable for overriding schemas 2017-11-27 10:54:19 +01:00
Jan Tojnar
1566de20c7
nixos/gnome3: override schemas using env variable
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overridden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-26 03:11:00 +01:00
Jan Tojnar
6e0fc275d6
nixos/tracker-miners: init 2017-11-26 03:10:56 +01:00
Orivej Desh
89912165e1
Merge pull request #31378 from michaelpj/imp/plymouth-nixos-branding
breeze-plymouth: add optional nixos branding, enable for plasma5
2017-11-18 10:37:26 +00:00
Michael Peyton Jones
eec4c31d89 plasma5: enable NixOS branding in plymouth theme 2017-11-18 10:36:23 +00:00
Tim Steinbach
c9b8bbd039
Merge pull request #31268 from Ma27/x11-defaults
services.xserver: fix defaults of X11
2017-11-15 16:41:52 +00:00
Jan Tojnar
a3509f6c22
gnome3.gnome-online-miners: add missing dleyna dependency 2017-11-15 14:02:37 +01:00
Jan Tojnar
abb17136de
gnome3.gnome-photos: add missing dleyna depenency 2017-11-15 14:02:37 +01:00
Jan Tojnar
510737cca7
nixos/gnome3: override schemas using env variable
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overriden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-15 03:45:25 +01:00
José Romildo Malaquias
c42a0fbf09 enlightenment: 0.21.10 -> 0.22.0
- Update to version 0.22.0
- Switch build tools from autotools to meson
- Change handling of setuid programs
2017-11-13 00:22:01 -02:00
Maximilian Bosch
410f0f0db2
services.xserver: fix apply of default DM/WM
This is needed to pick the first enabled DM/WM
if the default is `none`
2017-11-07 12:18:24 +01:00
Orivej Desh
4435bb8ba8
Merge pull request #30665 from michaelpj/imp/plymouth-themes
plymouth: fix breeze-plymouth (and other themes)
2017-11-06 06:18:38 +00:00
Maximilian Bosch
5b70c1855b
Revert "Revert "services.xserver: assert that either desktop- or window manager is not "none"""
This reverts commit e64dc25434.
2017-11-05 07:32:56 +01:00
Herwig Hochleitner
e64dc25434 Revert "services.xserver: assert that either desktop- or window manager is not "none""
This reverts commit 93c54acf97.
This reopens #30517 @nbp @Ma27

Breaking people's config for this is hardly reasonable as is. If it
absolutely cannot be avoided, at the very least, we need to provide
clear instructions on what people need to upgrade in their config. I
actually had to bisect to the commit, to even find out what property I
should change or define, as the error message was useless. It didn't
even mention a property name.

Discussion on the PR seems to be ongoing, so I'm reverting this, so we
don't break people's systems on unstable.
2017-11-05 01:51:13 +01:00
Maximilian Bosch
93c54acf97 services.xserver: assert that either desktop- or window manager is not "none"
resolves #11064
2017-11-04 15:30:20 +01:00
José Romildo Malaquias
b6d27b7271 lxqt: remove lxqt-common 2017-11-02 00:14:46 -02:00
Michael Peyton Jones
0966f8282a plasma5: use mkDefault for a few options that users might want to set 2017-10-22 00:18:21 +02:00
Michael Peyton Jones
e6a199b95d plasma5: set default theme for plymouth 2017-10-21 22:45:48 +01:00
Thomas Tuegel
ebcccaf754
plasma-workspace: enable Wayland session support 2017-10-20 09:28:56 -05:00
Profpatsch
2864bc8fd9 Revert "desktop-managers: do not leak feh to PATH" 2017-10-13 10:48:07 +02:00
Peter Hoeg
f7ba92bfa3 Merge pull request #30286 from yegortimoshenko/patch-2
desktop-managers: do not leak feh to PATH
2017-10-13 11:13:21 +08:00
Patrick Chilton
e3675fedc7 mate-power-manager: init at 1.18.0 2017-10-12 08:22:21 +02:00
Thomas Tuegel
b25deccd1a
nixos/plasma5: install phonon backends for each current Qt version
Fixes #27050, where the phonon backend was not found.
2017-10-11 18:29:43 -05:00
Yegor Timoshenko
f9415cb621 desktop-managers: do not leak feh to PATH
feh is used to set background image for desktop managers that do not support it directly, however there is no need to include it in PATH.

Fixes #17450.
2017-10-10 15:46:33 +00:00
Jan Tojnar
69698ec11c gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.
2017-09-24 12:15:50 +01:00
romildo
c4dd81b81d mate: remove icon cache 2017-09-01 17:27:24 -03:00
Jörg Thalheim
d0e4aef32a Merge pull request #28781 from romildo/mate
mate: add the MATE desktop environment
2017-08-31 18:57:20 +01:00
romildo
56345c0ee4 mate: add icon themes 2017-08-31 13:30:44 -03:00
romildo
dcebb0668b mate: add the MATE desktop environment 2017-08-31 00:16:51 -03:00
Symphorien Gibol
bd54589233 networkmanager_iodine: init at 1.2.0 2017-08-30 02:58:29 +02:00
Jörg Thalheim
ddf540d44c Merge pull request #27096 from gnidorah/maxx
maxx: init at 1.1.0
2017-08-25 06:40:31 +01:00
gnidorah
15ae2cbeea maxx: use libredirect 2017-08-24 19:34:08 +03:00
gnidorah
b73ae0a695 maxx: move deps from module to package 2017-08-14 11:13:49 +03:00
Jan Tojnar
c9d419a22b gnome: Further fixes for Using the 'memory' GSettings backend issue 2017-08-05 12:21:00 +02:00
gnidorah
52deb4b460 maxx: 1.0.0 -> 1.1.0 2017-07-24 13:19:45 +03:00
gnidorah
7f13a3f5b8 maxx: init at 1.0.0 2017-07-04 13:42:53 +03:00
romildo
c5ff68b3c2 lumina: 1.2.0-p1 -> 1.3.0
- Update to version 1.3.0

- Remove dependency on `oxygen-icons5`, as Lumina desktop now distributes
it’s own "material-design-[light/dark]" icon themes and uses them as the
default icon sets.
2017-06-29 08:13:09 -03:00
Thomas Tuegel
faf0d3e91d
kdeFrameworks: fixup inputs and outputs
- Reduce environment pollution with a separate $bin output containing programs,
  plugins, and shared data. Libraries remain in $out and are not installed into
  the environment.
- Only propagate build inputs as required.
2017-06-18 08:44:45 -05:00
Thomas Tuegel
870c07cc2b
sddm: take themes from system environment 2017-06-18 08:43:39 -05:00
Thomas Tuegel
be7b7d908f
Remove kdeWrapper 2017-06-18 08:43:39 -05:00
Thomas Tuegel
3f3d33a078
qt5: use distinct lib/qt-5.x prefix for each minor version
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
romildo
aa8018103c nixos-artwork: add more wallpapers
Restructure the nixos-artwork to make it easy to selectively
incorporate other components from upstream without needing to download
the full package.

Until now only the Gnome_Dark wallpaper was included. Add other
wallpapers available in the package repository.
2017-06-07 18:00:58 -03:00
Tom Smeets
5886b7fd72 desktopManager service: Document background image location 2017-05-26 14:43:33 +00:00
Tom Smeets
6a7590d78a desktopManager service: Add wallpaper options
These options are used by `feh` when setting the wallpaper.
2017-05-26 14:43:33 +00:00
Stefan Lau
a3696aa090 networkmanager_fortisslvpn: init at 1.2.4 2017-05-19 19:18:30 +02:00
Bjørn Forsman
f9633c7791 nixos/gnome3: fix screen sharing
Without this change there will be silent errors when enabling screen
sharing. The GUI thinks it enables the service when it in fact does not
(errors are seen in the system journal).

vino is already in the closure of gnome-control-center, so this is
basically free.

Configuration of screen sharing is done in GNOME control center.
2017-05-17 15:23:11 +02:00
montag451
3be53fca60 gnome-disks: add D-Bus service 2017-05-06 19:40:37 +02:00
Thomas Tuegel
4e0d21edd1 Merge pull request #25285 from ttuegel/qt--fix-plugin-paths
Qt: purify plugin paths, unify Linux and Darwin builders
2017-04-30 07:33:50 -05:00
Michael Weiss
852813689a desktop-managers: Use a black BG as fallback
Use a solid black background when no background image (via
~/.background-image) is provided. In my case this fixes the really
strange behaviour when i3 without a desktop manager starts with the SDDM
login screen as background image.
2017-04-29 19:03:30 +02:00
Thomas Tuegel
b70837e054
nixos/plasma5: set system-wide QT_PLUGIN_PATH 2017-04-28 05:54:18 -05:00
Robin Gloster
c2b9b8031f Merge pull request #24026 from benley/use-xkbDir
nixos: Use xkbDir consistently so it has an effect
2017-03-23 18:02:26 +01:00
Thomas Tuegel
a96e047b31
nixos/sddm: replace themes option with package option 2017-03-22 07:44:55 -05:00
Thomas Tuegel
7ca62935bb
nixos/plasma5: do not include extra-cmake-modules in sddm
Fixes #24126.
2017-03-22 07:44:55 -05:00
Thomas Tuegel
d709cdd829
nixos/plasma5: do not set kimpanel as default IBus panel
kimpanel does not show installed IBus engines or allow switching input
methods. kimpanel does show configured keyboard layouts through kxkb, so I
believe there is some problem communicating with IBus. No error messages are
produced in the log and I have been unable to discover the cause. I have no
intention of continuing to work on kimpanel at this time, so it should be
disabled. The GTK+ 3-based panel provided by IBus is perfectly serviceable in
the interim.
2017-03-20 09:31:05 -05:00
Thomas Tuegel
4837aba1ee Merge pull request #24101 from romildo/fix.lumina
lumina: fix kwindowsystem and oxygen-icons5 attributes
2017-03-20 09:00:25 -05:00
romildo
501d9c7186 lumina: fix kwindowsystem and oxygen-icons5 attributes 2017-03-19 21:46:35 -03:00
Benjamin Staffin
b79c284952
nixos: Use xkbDir consistently so it has an effect 2017-03-18 17:56:38 -04:00
Franz Pletz
9536169074
nixos/treewide: remove boolean examples for options
They contain no useful information and increase the length of the
autogenerated options documentation.

See discussion in #18816.
2017-03-17 23:36:19 +01:00
Thomas Tuegel
64b88c3017 Merge branch 'master' into phonon-gstreamer 2017-03-10 07:30:14 -06:00
Thomas Tuegel
edd43351cf
nixos/plasma5: no need to set gstreamer plugin path 2017-03-10 07:26:40 -06:00
Thomas Tuegel
e3cb24d1e0 Merge pull request #23503 from ttuegel/fontconfig
Generalize Fontconfig options
2017-03-09 19:29:28 -06:00
Thomas Tuegel
cc7c3c6bb8
nixos/plasma5: set GST_PLUGIN_SYSTEM_PATH_1_0 to list of paths 2017-03-04 16:31:22 -06:00
Thomas Tuegel
42cf524f2d
nixos/plasma5: set default fonts for Plasma desktop 2017-03-04 14:59:11 -06:00
David Costa
fc6c50f1b5 xfce: add screenLock option
screenLock option is needed to provide at least one application for
xflock4 to lock the screen
2017-03-04 18:01:02 +01:00
Thomas Tuegel
127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel
f21d4d0015
nixos/plasma5: Rename Plasma 5 desktop
- There is no such thing as KDE 5
2017-02-27 11:49:31 -06:00
Thomas Tuegel
8eb4d2afbc
Remove top-level kde5 attribute
- There is no such thing as KDE 5
2017-02-27 11:49:10 -06:00
Gauthier POGAM--LE MONTAGNER
b65cc5c59e kde5: add hack font dependency (fix #22975) 2017-02-25 00:35:59 +01:00
Joachim F
ecdfffd9fc Merge pull request #22433 from laMudri/xfwm-option
xfce: make xfwm optional
2017-02-19 15:26:07 +01:00