1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
Commit graph

1367 commits

Author SHA1 Message Date
Thomas Tuegel 1a903be2de
Merge pull request #79011 from ttuegel/update--plasma-5.17.5
Plasma 5.17.5
2020-02-06 09:59:51 -06:00
Jan Tojnar bd9c5b933c
nixos/services.xserver: Fix legacy options for default wm without dm
We switched to unified default session option services.xserver.displayManager.defaultSession
and included fallback path for the legacy options. Unfortunately when only
services.xserver.windowManager.default is set and not services.xserver.desktopManager.default,
it got incorrectly converted to the new option.

This should fix that.

Closes: https://github.com/NixOS/nixpkgs/issues/76684
2020-02-06 02:34:56 +01:00
Thomas Tuegel 33dfefad14
nixos/plasma5: install plasma-browser-integration 2020-02-01 06:59:13 -06:00
Thomas Tuegel 9b85a399fd
nixos/plasma5: startkde -> startplasma-x11 2020-01-31 19:55:25 -06:00
worldofpeace c95612a5a2 nixos/display-managers/auto: remove
This module allows root autoLogin, so we would break that for users, but
they shouldn't be using it anyways. This gives the impression like auto
is some special display manager, when it's just lightdm and special pam
rules to allow root autoLogin. It was created for NixOS's testing
so I believe this is where it belongs.
2020-01-29 19:05:46 -05:00
worldofpeace 138c94c75c
Merge pull request #77408 from petabyteboy/feature/geary-module
nixos/geary: init
2020-01-28 18:45:45 -05:00
Silvan Mosberger 766b78841f
Don't set background to black if ~/.background-image not prese… (#78346)
Don't set background to black if ~/.background-image not present
2020-01-28 16:42:44 +01:00
worldofpeace 966e56cdfb nixos/xfce: use sessionPackages 2020-01-24 10:47:55 -05:00
Silvan Mosberger 78d83650df
nixos/desktop-manager: Don't fall back to black background
Previously if ~/.background-image wasn't present, the background would
be set to black, which would override what the user could
set in e.g. services.xserver.windowManager.i3.extraSessionCommands
2020-01-23 05:01:39 +01:00
Silvan Mosberger 7a7b8d904b
nixos/desktop-managers: Remove needBGPackages thing
This value isn't used since 71a8dbb956
2020-01-23 02:35:01 +01:00
worldofpeace 348e48fdcc
Merge pull request #78004 from worldofpeace/mtrack-remove
nixos/multitouch: remove (properly known as mtrack)
2020-01-20 17:07:59 -05:00
worldofpeace afe27e517b nixos/multitouch: remove
On numerous occasions I have seen users mistake this
module as libinput because it being called "multitouch"
and them being unaware that the actually module they want
is libinput. They then run into several decrepit bugs due
to the completely out-of-date nature of the underlying package.
The underlying package hasn't been changed to an up-to-date
fork in a period of 8 years. I don't consider this to be production quality.
However, I'm not opposed for the module being readded to NixOS
with new packaging, and a better name.
2020-01-20 16:09:29 -05:00
Florian Klink b32b29963f
Merge pull request #78018 from rnhmjoj/typo
nixos/unclutter: fix old typo
2020-01-19 14:19:32 +01:00
rnhmjoj bac3e6841b
nixos/unclutter: fix old typo 2020-01-19 10:09:12 +01:00
worldofpeace c6022f7abf nixos/gnome3: add gnome-shell to systemd.packages
This actually gets added via xdg.portal having gnome-shell.
However, that could change and it still for sure should be here.
2020-01-18 20:26:45 -05:00
Elyhaka d18ac2bca1 gdm: refactor to properly handle wayland sessions 2020-01-18 10:56:11 +01:00
Milan Pässler fb9645656b nixos/geary: init 2020-01-10 02:00:08 +01:00
Anders Kaseorg 07ccbc099a nixos/gdm: Fix tmpfiles configuration syntax
Fixes this error from `nixos-rebuild switch` introduced by #75893:

setting up tmpfiles
[/etc/tmpfiles.d/nixos.conf:7] Invalid age 'yes'.
warning: error(s) occurred while switching to the new configuration

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-08 19:51:32 -08:00
worldofpeace c496b1b102
Merge pull request #63103 from rnhmjoj/loaof
Deprecate types.loaOf [WIP]
2020-01-06 11:00:17 -05:00
rnhmjoj 1d61efb7f1 treewide: use attrs instead of list for types.loaOf options 2020-01-06 10:39:18 -05:00
worldofpeace 00c813a636
Merge pull request #75893 from worldofpeace/gdm-tmpfiles
nixos/gdm: use systemd tmpfiles instead of preStart
2020-01-06 09:51:59 -05:00
Robert Hensing e1ce60ae7a
Merge pull request #76947 from juliancoffee/master
Fix example for xkbOptions
2020-01-05 23:35:27 +01:00
Robert Hensing 933003e684
Merge pull request #73394 from pasqui23/xkbopt
nixos/xserver:services.xserver.xkbOptions is now commas
2020-01-05 23:34:59 +01:00
Illia Denysenko 73b38ff7c5
Fix example for xkbOptions
###### Motivation for this change
With space between two options, multiple options just don't work
Looks like xkbOptions then used for generation of xorg.conf.d/00-keyboard.conf.
kbd's man says XkbOptions must be comma-separated without spaces.
https://linux.die.net/man/4/kbd

###### Things done

<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->

- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
- Built on platform(s)
   - [ ] NixOS
   - [ ] macOS
   - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Ensured that relevant documentation is up to date
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers

cc @
2020-01-04 20:54:19 +02:00
adisbladis aec68f4e7e
nixos/compton: Rename module to picom
With a backwards compatibility alias
2020-01-03 12:52:02 +00:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Frederik Rietdijk fb66525297 Merge master into staging-next 2019-12-29 10:19:39 +01:00
Tor Hedin Brønner 3d70d4ba0b
nixos/displayManager: fix typo in legacy sessions (#76626)
xsession gets passed `dm` `wm`, so the desktop manager would be launched
before the window manager resulting in a regular desktop manager
session.

Fixes https://github.com/NixOS/nixpkgs/issues/76625
2019-12-29 02:02:24 +01:00
Louis Bettens 636dabcf80 nixos/xserver: set $XKB_CONFIG_ROOT 2019-12-28 12:34:56 +01:00
worldofpeace 48557d3c57
Merge pull request #76160 from worldofpeace/mate-settings-daemon/fixup
nixos/mate: drop g-s-d enable
2019-12-23 08:53:10 -05:00
worldofpeace 35b7b17125
Merge pull request #76116 from worldofpeace/pantheon-cleanup
Pantheon cleanups
2019-12-22 22:59:21 -05:00
Pasquale f43d112ac2 nixos/xserver: services.xserver.xkbOptions is now commas 2019-12-22 10:50:40 +01:00
worldofpeace ab60b0e0c3 nixos/mate: drop g-s-d enable
I believe I forgot to remove this in 68ab37aa44.
2019-12-21 23:12:45 -05:00
worldofpeace 016c589bb4 nixos/pantheon: options for extra switchboard plugs and wingpanel indicators 2019-12-21 23:08:13 -05:00
worldofpeace 4ed65a891c nixos/pantheon: don't abstract default packages to pkgs
Also cleanup a bit, we enabled gnome-settings-daemon even when using elementary-settings-daemon.
I wanted the nixos module ascribe the defaults, not these lists in pkgs.
2019-12-21 23:08:13 -05:00
worldofpeace 4fb91d10c8 nixos/pantheon: add an apps.enable option 2019-12-21 23:08:13 -05:00
markuskowa 898f188fd0
Merge pull request #68301 from gnidorah/cde2
cdesktopenv: init at 2019-11-30
2019-12-21 13:22:33 +01:00
Silvan Mosberger 8c39d6917e
Merge pull request #76054 from turboMaCk/imwheel-fixes
services.xserver.imwheel: Fix default extraOptions
2019-12-20 15:43:15 +01:00
worldofpeace ee75a460af nixos/pantheon: move contractor module into xservice 2019-12-20 09:26:35 -05:00
worldofpeace 1ec2b545dd nixos/pantheon/files: remove
Made nun sense.
2019-12-20 09:25:37 -05:00
Marek Fajkus 66eef90547
services.xserver.imwheel: Fix default extraOptions 2019-12-20 12:52:43 +01:00
worldofpeace 15a9c80c05 nixos/gdm: use systemd tmpfiles instead of preStart
Thet was a mess before. This should be more reliable.
2019-12-18 15:40:12 -05:00
gnidorah c527e31c99 cdesktopenv: init at 2019-11-30 2019-12-15 22:28:31 +03:00
Jan Tojnar 8dc5ff7dcf
nixos/displayManager: deprecate separate options for default wm/dm
The upstream session files display managers use have no concept of sessions being composed from
desktop manager and window manager. To be able to set upstream session files as default
session, we need a single option. Having two different ways to set default session would be confusing,
though, so we decided to deprecate the old method.

We also created separate script for each session, just like we already had a separate desktop
file for each one, and started using displayManager.sessionPackages mechanism to make the
session handling more uniform.
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner 53ef29c138
nixos/lightdm: enable wayland sessions
Note: can't launch gnome on wayland due to duplicate entry names:
  https://github.com/CanonicalLtd/lightdm/issues/16
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner d25365c3c1
nixos/displayManager: introduce defaultSession
There's two ways of providing graphical sessions now:
- `displayManager.session` via. `desktopManager.session` and
  `windowManager.session`
- `displayManager.sessionPackages`

`sessionPackages` doesn't make a distinction between desktop and window
managers. This makes selecting a session provided by a package using
`desktopManager.default` nonsensical.

We therefor introduce `displayManager.defaultSession` which can select a session
from either `displayManager.session` or `displayManager.sessionPackages`.

It will default to `desktopManager.default + windowManager.default` as before.
If the dm default is "none" it will select the first provided session from
`sessionPackages`.
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner 58e5290fce
nixos/displayManager: check for provided sessions in mkDesktops 2019-12-15 04:16:20 +01:00
Tor Hedin Brønner dd7144b860
nixos/sessionPackages: provide session names in passthru
We want access to the valid session names at evaluation time.
2019-12-15 04:16:18 +01:00
Tor Hedin Brønner d362df6682
nixos/display-manager: extraSessionFilePackages -> sessionPackages 2019-12-15 04:14:56 +01:00
worldofpeace 557f93dd96
Merge pull request #75558 from worldofpeace/pantheon-show-manual-login
nixos/lightdm-greeters/pantheon: show manual login card
2019-12-13 18:59:46 -05:00
Marek Fajkus 7406c0af98
services.xserver.imwheel: add module 2019-12-13 18:19:29 +01:00
worldofpeace a24004fa38 nixos/lightdm-greeters/pantheon: show manual login card
I find this important to be default on for users in https://github.com/elementary/greeter/issues/394
2019-12-12 07:22:37 -05:00
Tor Hedin Brønner d04157fb98 nixos/gdm: do not force the session
Having a default session resulted in GDM not remembering the last used
session.

So do not force the session until setSessionScript is made aware of the
last session used.
2019-12-11 13:50:18 +01:00
Edmund Wu 632a8a7bb2
nixos/xserver: introduce attr display to xserver.drivers
Specifically for NVIDIA so that only the device section would be created
2019-12-10 11:35:29 -05:00
Silvan Mosberger 4ee3e8b21d
nixos/treewide: Move rename.nix imports to their respective modules
A centralized list for these renames is not good because:
- It breaks disabledModules for modules that have a rename defined
- Adding/removing renames for a module means having to find them in the
central file
- Merge conflicts due to multiple people editing the central file
2019-12-10 02:51:19 +01:00
worldofpeace 8783acb0bd nixos/pantheon: use GTK3_MODULES
Fixes https://github.com/NixOS/nixpkgs/issues/75244

See also https://github.com/elementary/default-settings/pull/150.
2019-12-08 19:41:12 -05:00
rnhmjoj 1a2e7c3b00
nixos: add myself to maintainers 2019-12-04 17:09:53 +01:00
worldofpeace 5350db96e2
Merge pull request #74838 from jtojnar/pantheon-debug
nixos/pantheon fix GNOME_SESSION_DEBUG conflict
2019-12-02 18:05:41 +00:00
Jan Tojnar 9129616919
nixos/pantheon fix GNOME_SESSION_DEBUG conflict
When session debugging was enabled in GNOME but not in Pantheon

	{
	  services.xserver = {
	    desktopManager.pantheon = {
	      enable = true;
	    };
	    desktopManager.gnome3 = {
	      enable = true;
	      debug = true;
	    };
	  };
	}

it caused a conflict:

	error: The option `environment.sessionVariables.GNOME_SESSION_DEBUG' has conflicting definitions, in `<nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix>' and `<nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix>'.
2019-12-02 17:25:24 +01:00
worldofpeace 15951cba08
Merge pull request #63607 from rnhmjoj/remove-obex
nixos/bluetooth: don't install obex tools by default
2019-12-01 22:50:47 +00:00
rnhmjoj 40d4c3c93e
nixos/plasma5: install obex tools when bluetooth is enabled 2019-12-01 22:52:58 +01:00
Jan Tojnar 8cbc862b83
dconf: move to top-level 2019-12-01 01:01:40 +01:00
worldofpeace 1b5df99e7a
Merge pull request #70295 from worldofpeace/mutter-eglstreams
Mutter eglstreams
2019-11-27 05:29:58 +00:00
worldofpeace 519448d2e3 nixos/gdm: don't raise an Exception in set-session script
https://github.com/NixOS/nixpkgs/pull/73378#discussion_r349825541
2019-11-22 18:05:31 -05:00
worldofpeace bec88e1110
Merge pull request #73378 from worldofpeace/gdm-default-session
nixos/gdm: make desktopManager.default work
2019-11-22 22:49:15 +00:00
worldofpeace d8b50bfe47 nixos/gdm: make desktopManager.default work
Unfortunately, you can't configure the default user-session
with GDM like lightdm. I've opened a feature request [0]
but I'd like to be able to do this now.

We use a GObject Python script using bindings to AccountsService
to achieve this. I'm hoping the reliable heuristic for session names
is the file's basename. We also have some special logic for which
method to use to set the default session. It seems set_x_session is
deprecated, and thusly the XSession key, but if that method isn't used
when it's an xsession it won't be the default in GDM.

[0]: https://gitlab.gnome.org/GNOME/gdm/issues/535
2019-11-22 17:47:03 -05:00
Jan Tojnar 77661f8cfd
nixos/plasma5: drop enableQt4Support option
Phonon no longer supports Qt4 so this is useless.
2019-11-22 09:01:05 +01:00
Jan Tojnar 6fb5b6be98
Various GNOME leaf package updates (#73790)
Various GNOME leaf package updates
2019-11-21 01:00:42 +01:00
Jan Tojnar a7f4c78792
gnome-user-docs: move to top-level again 2019-11-20 04:58:00 +01:00
worldofpeace a80f1c4151
Merge pull request #72800 from worldofpeace/xfce-4.12-drop
Drop Xfce 4.12 and promote Xfce module and packageset to 4.14
2019-11-20 00:19:03 +00:00
worldofpeace 04e56aa016 nixos/xfce4-14: remove and move to xfce
We want only one xfce module and packageset.
2019-11-19 18:47:02 -05:00
worldofpeace c5176abf81 nixos/xfce4-14: support thunarPlugins 2019-11-19 18:47:02 -05:00
worldofpeace 687debc45b
Merge pull request #72774 from sylv-io/libinput
nixos/libinput: apply options to all device types
2019-11-19 22:41:39 +00:00
worldofpeace d41a2e3398 nixos/gdm: disable wayland when modesetting is disabled
Probably a good idea to have.
2019-11-19 15:34:39 -05:00
worldofpeace 84e6784aae nixos/gdm: add nvidiaWayland option 2019-11-19 15:34:39 -05:00
worldofpeace 4583e293fd
Merge pull request #73251 from worldofpeace/remove-slim
nixos/slim: remove
2019-11-15 15:56:48 +00:00
worldofpeace b252047216
Merge pull request #71390 from hedning/enable-gnome-shell-RT
Enable soft real time for gnome shell
2019-11-12 20:32:05 +00:00
worldofpeace 470254a6da
Merge pull request #72959 from worldofpeace/gnome-flashback-systemd
nixos/gnome3: add gnome-flashback to systemd.packages
2019-11-12 01:53:09 +00:00
worldofpeace ce26b3eaf0 nixos/slim: remove
The SLIM project is abandoned and their last release was in 2013.
Because of this it poses a security risk to systems, no one is working
on it or picked up maintenance. It also lacks compatibility with systemd
and logind sessions. For users, there liikely isn't anything like slim
that's as lightweight in terms of dependencies.
2019-11-11 17:10:41 -05:00
worldofpeace 6783fdd561
Merge pull request #71416 from worldofpeace/gnome3-sound-theme
nixos/gnome3: add sound-theme-freedesktop
2019-11-09 21:33:49 +00:00
Matthew Bauer 03f8acabc8
Merge pull request #71408 from f--t/fix/x11-services
Fix nixos x11 service logging for ssdm and xmonad
2019-11-07 17:03:52 -05:00
worldofpeace 473cd0d4ba nixos/gnome3: add gnome-flashback to systemd.packages
When we did the revert of adding gnome-flashback to systemd.packages [0]
I forgot to test with other display managers. If we use GDM with gnome-flashback
it appears it doesn't try to fallback to non-systemd startup and always fails and
starts the regular gnome-session. So adding gnome-flashback to systemd.packages
was perfectly fine, but we did forgot one detail. We need systemd targets for the
customSessions which is added using  mkSystemdTargetForWm in the gnome-
flashback package.

[0]: 42f567b30d
2019-11-06 15:15:11 -05:00
Gabriel Ebner cb8423d19b
Merge pull request #72698 from gebner/digimend-drivers
digimend drivers for graphics tablets
2019-11-04 21:19:06 +01:00
Marcello Sylvester Bauer d6169284c4 nixos/libinput: apply options to all device types
Instead of assign the libinput options to touchpad devices only, it
should be appied by any device using libinput.
Due to the fact that `40-libinput.conf` already defines libinput as
driver for any detected input device, we can use `MatchDriver` to appy
options.
2019-11-04 13:02:08 +01:00
Gabriel Ebner c2b54c59e8 nixos/digimend: init module 2019-11-03 17:32:46 +01:00
worldofpeace 4bdbbc1b33 nixos/gnome3: add sound-theme-freedesktop
I've noticed a similar issue in Pantheon, without this
sound theme installed there's no system sounds.
I believe it's because the gnome theme and the pantheon
theme inherit this one.
2019-11-03 10:19:25 -05:00
SRGOM fe26d4c0df
nixos/x11/libinput: Document values for option
For option `scrollMethod`, document that there is an available value of `button`.
2019-10-21 12:46:01 +05:30
worldofpeace 42f567b30d Revert "nixos/gnome3: fix gnome-flashback"
This reverts commit 60aedadc59.

Using tests from #71212 I am now unable to reproduce there being issues
with starting the default metacity flashback session without this.
2019-10-19 19:57:49 -04:00
ft 1390ed10e7 nixos/widnow-managers/xmonad: fix systemd identifier for xmonad 2019-10-19 16:36:29 -07:00
ft 5834d78a20 ssdm: fix identifier for xserver-wrapper 2019-10-19 16:36:29 -07:00
Tor Hedin Brønner 927a6fdaad nixos/gnome3: launch gnome-shell wayland with RT scheduling
We create a wrapper which launches gnome-shell with the correct environment and
cap_sys_nice.

We can then override gnome-shell-wayland.service to use this wrapper.

NOTE: We need to force clear the environment, because the defaults aren't good
for user services. That should probably be fixed.
2019-10-19 17:14:38 +02:00
worldofpeace 0dbbeabdab nixos/gnome3: copy flashback gschema overrides 2019-10-15 20:56:09 -04:00
worldofpeace 60aedadc59 nixos/gnome3: fix gnome-flashback
This session would fail to start because we didn't have it in systemd.packages
(as we've switched to systemd gnome-session).

Haven't tested custom sessions.
2019-10-15 20:15:46 -04:00
worldofpeace 6d5fe6b8ed
Merge pull request #71065 from worldofpeace/gdm-no-plymouth-conflict
nixos/gdm: don't conflict with plymouth-quit
2019-10-13 17:34:00 +00:00
worldofpeace ed20a541c5 nixos/gdm: don't conflict with plymouth-quit
Co-Authored-By: Tor Hedin Brønner <torhedinbronner@gmail.com>
2019-10-13 13:30:43 -04:00
Tor Hedin Brønner d15e5b02fe
nixos/lightdm: do not conflict with plymouth (#71061)
Having `display-manager` conflict with `plymouth-quit` causes this lock up:

 - `plymouth-quit-wait` starts up, waiting for plymouth-quit to run
 - `lightdm` starts up
 - `plymouth-quit` can't start, it conflicts with lightdm
 - `plymouth-quit-wait` keeps waiting on plymouth-quit to kill plymouthd

The idea is having LightDM control when plymouth quits, but communication with
plymouth was broken: https://github.com/NixOS/nixpkgs/pull/71064

Unfortunately having the conflict breaks switching to configurations with
plymouth enabled. So we still need to remove the conflict.

fixes #71034
2019-10-13 10:03:54 +02:00
Tor Hedin Brønner 5b7c900192
nixos/gdm: do not restart on reload switch (#70357)
Not entirely sure how this works, but this does seem to fix reload switch
killing the current graphical session.
2019-10-11 20:07:16 +02:00
Aaron Andersen 0b6067f93e
Merge pull request #68836 from Thra11/wacomtablet-kcm
wacomtablet: init at 3.2.0
2019-10-11 05:52:37 -04:00
worldofpeace 1169336cd9
Merge pull request #70448 from worldofpeace/lightdm-improve-systemd
nixos/lightdm: improve systemd service
2019-10-09 21:22:19 +00:00
José Romildo Malaquias f251c29484
Merge pull request #70035 from mkf/cwm-windowManager
nixos/cwm: init. Added windowManager cwm, basing on the module for dwm.
2019-10-09 07:04:39 -03:00