3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1945 commits

Author SHA1 Message Date
Bobby Rong 29cb1c877c
Merge pull request #184409 from water-sucks/lightdm-slick-greeter
lightdm-slick-greeter: init at 1.5.9
2022-08-20 09:28:52 +08:00
pennae 6039648c50 nixos/*: automatically convert option docs 2022-08-19 22:40:58 +02:00
pennae 7e7d68a250 nixos/*: mark pre-existing markdown descriptions as mdDoc 2022-08-19 22:40:58 +02:00
pennae 8f8e101527 nixos/*: normalize <package> to <literal>
this renders the same in the manpage and a little more clearly in the
html manual. in the manpage there continues to be no distinction from
regular text, the html manual gets code-type markup (which was probably
the intention for most of these uses anyway).
2022-08-19 22:40:58 +02:00
Bobby Rong c52f565d3a Revert "nixos/lightdm: make lightdm user shell bash"
This reverts commit c134f6443a.
Pantheon is using GSD 3.38 nowadays, closes #101568
2022-08-19 23:25:53 +08:00
Bobby Rong e2ddd98cc9 nixos/cinnamon: default to slick-greeter
Default in Linux Mint.
2022-08-18 23:01:43 +08:00
Varun Narravula fdac82a307 nixos/lightdm-greeters/slick: init 2022-08-18 15:52:05 +08:00
Kira Bruneau 6e665c4e29
Merge pull request #185987 from LoveIsGrief/display-manager-read-.profile
Attempt to source .profile if .xprofile not found
2022-08-17 15:58:46 -04:00
LoveIsGrief 881512e23f
x11: Source .profile and .xprofile
Other popular distros (OpenSuse, Ubuntu, Gentoo, Arch) read $HOME/.profile when starting X11 display managers.
When moving to nixOS, that is then broken leading to unpredictable behavior (probably programs not working).

This adds similar behavior to https://github.com/sddm/sddm/blob/develop/data/scripts/Xsession

Related to #185979
2022-08-17 20:37:33 +02:00
Will Fancher d3e5bd0228 nixos: Don't enable packagekit by default 2022-08-17 13:53:21 -04:00
Bobby Rong 50c0564bc8
Merge pull request #186742 from bobby285271/cinnamon
Cinnamon updates 2022-08-15
2022-08-15 21:22:50 +08:00
Bobby Rong 9c69f307ce nixos/cinnamon: install gnome-screenshot
Closes #169178
2022-08-15 19:35:43 +08:00
pennae 50f9b3107a
Merge pull request #185474 from pennae/option-docs-md
nixos/*: more options md conversion
2022-08-12 23:23:26 +02:00
Anderson Torres 14c47e30b8
Merge pull request #185630 from AndersonTorres/wip-hackedbox
hackedbox: init at 0.8.5.1
2022-08-08 17:57:37 -03:00
K900 d68ba1d746 nixos/plasma5: default runUsingSystemd to on
Upstream switched as of 5.25
2022-08-08 22:31:26 +08:00
AndersonTorres 7b6ad60ab4 hackedbox: init at 0.8.5.1 2022-08-08 03:30:35 -03:00
Bobby Rong 9c16fe5b87
Merge #181918: Cinnamon 5.4
https://www.linuxmint.com/rel_vanessa_cinnamon_whatsnew.php
2022-08-07 10:07:01 +08:00
pennae 087472b1e5 nixos/*: automatically convert option docs 2022-08-06 20:39:12 +02:00
pennae 423545fe48 nixos/*: normalize manpage references to single-line form
now nix-doc-munge will not introduce whitespace changes when it replaces
manpage references with the MD equivalent.

no change to the manpage, changes to the HTML manual are whitespace only.
2022-08-05 18:34:50 +02:00
pennae 93c57a9884
Merge pull request #185056 from pennae/option-docs-md
nixos/*: more option docs conversions
2022-08-05 17:36:49 +02:00
Sandro c70ac648b5
Merge pull request #184454 from NixOS/lightdm 2022-08-04 15:05:13 +02:00
sternenseemann 53b33eee25 nixos/xmonad: don't reference nonexistent package sets in docs 2022-08-04 14:29:05 +02:00
sternenseemann 531ff521d4 nixos/xmonad: rename NIX_GHC env var to XMONAD_GHC
Upstream XMonad was using our xmonad patch file for their flake build to
support our nixos module. This would of course break the build upstream
if the version we patched and their master branch diverged. We
[discussed] that it'd make sense to upstream the environment var code.
In the process it seemed sensible to rename the NIX_GHC variable as
well, since it isn't really Nix-specific – it's just a way to set the
GHC binary to execute. This change has been [implemented] upstream in an
unreleased version of xmonad now – meaning we'll be able to drop the
xmonad patch soon!

This also clarifies the situation in nixpkgs a bit: NIX_GHC is easy to
confuse with the environment variable used in the ghcWithPackages
wrapper where it is used to set an alternative prefix for a GHC-wrapper
for applications trying to discover it via e.g. ghc-paths. It is an
implementation detail in this context, as it is in the case of the
xmonad module. Since they are different implementations doing different
things, different names also make sense.

[discussed]: 36d5761b3e
[implemented]: 23f36d7e23
2022-08-04 14:29:05 +02:00
pennae 61e93df189 nixos/*: automatically convert option docs to MD
once again using nix-doc-munge (69d080323a)
2022-08-03 22:46:41 +02:00
pennae 694d5b19d3 nixos/*: replace </para><para> with double linebreaks
our xslt already replaces double line breaks with a paragraph close and
reopen. not using explicit para tags lets nix-doc-munge convert more
descriptions losslessly.

only whitespace changes to generated documents, except for two
strongswan options gaining paragraph two breaks they arguably should've
had anyway.
2022-08-03 20:39:21 +02:00
Bobby Rong be91726358
treewide: rename cinnamon.xapps to cinnamon.xapp
https://github.com/linuxmint/xapps redirects to https://github.com/linuxmint/xapp, and the meson project name is xapp.
2022-08-03 20:47:04 +08:00
Bobby Rong 20d269ea81
nixos/cinnamon: switch to blueman
Part of Linux Mint 21 changes.
https://www.linuxmint.com/rel_vanessa_cinnamon_whatsnew.php
2022-08-03 20:46:35 +08:00
pennae 6b13dd0e9e
Merge pull request #183491 from pennae/automatic-md-conversions
treewide: automatically md-convert option descriptions
2022-08-02 02:15:30 +02:00
Bobby Rong 231631eb93
lightdm-gtk-greeter: rename from lightdm_gtk_greeter
To match the current naming convention.
2022-08-01 16:36:52 +08:00
pennae 2e751c0772 treewide: automatically md-convert option descriptions
the conversion procedure is simple:

 - find all things that look like options, ie calls to either `mkOption`
   or `lib.mkOption` that take an attrset. remember the attrset as the
   option
 - for all options, find a `description` attribute who's value is not a
   call to `mdDoc` or `lib.mdDoc`
 - textually convert the entire value of the attribute to MD with a few
   simple regexes (the set from mdize-module.sh)
 - if the change produced a change in the manual output, discard
 - if the change kept the manual unchanged, add some text to the
   description to make sure we've actually found an option. if the
   manual changes this time, keep the converted description

this procedure converts 80% of nixos options to markdown. around 2000
options remain to be inspected, but most of those fail the "does not
change the manual output check": currently the MD conversion process
does not faithfully convert docbook tags like <code> and <package>, so
any option using such tags will not be converted at all.
2022-07-30 15:16:34 +02:00
Bobby Rong 1abe15cfa5
nixos/cinnamon: install xed-editor
xed is not the editor you want in Nixpkgs but a x86 encoder decoder.
2022-07-30 19:51:15 +08:00
AndersonTorres bef8e4df1d fvwm3: nixos module 2022-07-28 22:28:41 -03:00
AndersonTorres 2617a00699 fvwm: rename nixos module to fvwm2 2022-07-28 22:28:39 -03:00
Alois Wohlschlager df2318949e
oxygen-sounds: init at 5.25.3
These are the notification sounds used all over the place by Plasma
components.
2022-07-28 18:09:49 +02:00
Naïm Favier 77307fcff8
nixos/picom: use types.numbers.between 2022-07-24 18:03:28 +02:00
Sandro 2d0f98389f
Merge pull request #175738 from SuperSamus/plasma 2022-07-16 00:56:08 +02:00
José Romildo 7e30ebb2c2 nixos/lxqt: add a module for the lxqt portal 2022-07-12 17:17:39 -03:00
Martino Fontana 5e84f7899e nixos/plasma5: expose qdbus in PATH 2022-07-08 23:33:19 +02:00
Martino Fontana 7a4e909905 nixos/plasma5: enable power-profiles-daemon by default 2022-07-08 23:32:51 +02:00
K900 512a26ae13
Merge pull request #177389 from K900/plasma-exclude-packages
nixos/plasma5: add excludePackages option
2022-07-08 21:33:35 +03:00
Klemens Nanni 987400b848 nixos/desktop-manager: Use literal newline to fix shell syntax
Running `nixos/tests/keepassxc.nix` shows:
```
machine # [   18.705390] xsession[985]: /nix/store/2g2jx5c6x3p152wbiijr0rmky7byqivc-xsession: line 13: nn: command not found
```

This garbled bash script runs without `set -o errexit` and thus skips
"\n\n" as invalid command:
```
$ cat -n /nix/store/2g2jx5c6x3p152wbiijr0rmky7byqivc-xsession
...
\n\n
            if [ -e $HOME/.background-image ]; then
              /nix/store/wq1d1ph8wj4alpx78akvpbd0a0m9qkd1-feh-3.8/bin/feh --bg-scale  $HOME/.background-image
            fi
...
```

KeePassXC uses it through
`nixos/modules/services/x11/display-managers/default.nix`:
```
...
        # Script responsible for starting the window manager and the desktop manager.
        xsession = dm: wm: pkgs.writeScript "xsession" ''
          #! ${pkgs.bash}/bin/bash

          # Legacy session script used to construct .desktop files from
          # `services.xserver.displayManager.session` entries. Called from
          # `sessionWrapper`.

          # Start the window manager.
          ${wm.start}

          # Start the desktop manager.
          ${dm.start}
...
        '';
...
```

The bogus line was introduced in PR #160752:
```
commit 0bc0dc8090
Author: Shaw Vrana <shaw@vranix.com>
Date:   Fri Feb 18 11:27:42 2022 -0800

    desktop manager script: start properly

    Adds a missing line feed when X is enabled to the start script name
    and the appended if check. Resolves #160735
```

I have not tried to reproduce the original issue and thus don't know
why "\n\n" apparently gets interpreted fine in one place but remains
literal the `xsession` case.

However, using a literal newline must be valid for all cases and
certainly fixes the warning seen in KeePassXC tests.

Furthermore, starting the nix string (`''`) with a newline as usual also
fixes its overall indentation.
2022-07-01 16:30:47 +04:00
José Romildo d18aeb6351 nixos/xfconf: init
- Add a module for xfconf, the Xfce configuration storage system.
2022-06-26 14:29:01 -03:00
José Romildo bb5ec4625a nixos/thunar: init
- Add a module for the thunar file manager, which depends on the xfconf dbus service, and also has a dbus service and a systemd unit.

- Renames the option services.xserver.desktopManager.xfce.thunarPlugins to programs.thunar.plugins.
2022-06-26 12:22:07 -03:00
Sophie Taylor 62494281d8
xpra: fix whitespace 2022-06-19 18:26:10 +10:00
Sophie Taylor f13c61a3b9
xpra: Add the ability to perform a start-desktop 2022-06-19 11:40:41 +10:00
Bobby Rong 6d1779c567
Merge pull request #175620 from bobby285271/nixos-pantheon
nixos/pantheon: make it possible to remove core packages
2022-06-15 18:49:37 +08:00
Andreas c028f5569b kcheckpass is gone(?) 2022-06-15 14:53:40 +08:00
K900 6350d8d9b3 nixos/plasma5: add excludePackages option
This is a pretty straightforward port of #151005.
More things can probably be made optional, I've only added ones
that I'm confident in.
2022-06-12 14:39:59 +03:00
Bobby Rong 2375fac93d
nixos/pantheon: treat evince and file-roller as optional app 2022-06-12 13:12:15 +08:00
Bobby Rong 860781d909
nixos/pantheon: allow disabling pantheon-agent-geoclue2 2022-06-12 13:11:58 +08:00
Bobby Rong 1097e3e80c
nixos/pantheon: make it possible to remove core packages 2022-06-12 11:39:05 +08:00
Bobby Rong c1559a07fe
nixos/pantheon: switch to xdg.icons.enable 2022-06-12 11:39:04 +08:00
Bobby Rong 9ca889d0fb
nixos/pantheon: switch to xdg.mime.enable 2022-06-12 11:39:01 +08:00
Jan Tojnar c397df20d1
Merge pull request #151005 from rhoriguchi/gnome
nixos/gnome: make it possible to remove core packages
2022-06-11 21:40:35 +02:00
rnhmjoj 26526f02ad
nixos/picom: remove deprecated refreshRate option
Fix #175765
2022-06-11 08:59:20 +02:00
Ryan Horiguchi 42ceb20d29 nixos/gnome: make it possible to remove core packages
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2022-06-09 13:09:55 +02:00
Jan Tojnar ca23e42105 nixos/gnome: Move sessionPath to core-shell group
This will allow people to disable these packages.
2022-06-09 13:04:20 +02:00
Jan Tojnar 016b99dce6 nixos/gnome: drop hicolor-icon-theme
It is already installed by xdg.icons.enable.

Let’s also enable that option explicitly to prevent users from accidentally
disabling it since GNOME will be severely broken without it.
2022-06-09 13:04:20 +02:00
Jan Tojnar aad39fe41a nixos/gnome: drop shared-mime-info
It is already installed by xdg.mime.enable.

Let’s also enable that option explicitly to prevent users from accidentally
disabling it since GNOME will be severely broken without it.
2022-06-09 13:04:19 +02:00
colin 1d0649f929 phosh: restrict the scale config value to strictly positive values or null 2022-06-02 01:46:08 -07:00
colin cabf369f83 phosh: allow fractional scaling 2022-06-01 15:44:12 -07:00
Bobby Rong ce084ad5bf
Merge pull request #173842 from bobby285271/pantheon-updates
nixos/pantheon: install sideload when Flatpak is enabled
2022-05-21 17:34:41 +08:00
Bobby Rong 646336ee06
nixos/pantheon: install sideload when Flatpak is enabled
Tested by installing VLC from Flathub, sideload is installed by default on elementary OS.
2022-05-21 14:05:42 +08:00
Bobby Rong cee75cb765
Merge pull request #173459 from bobby285271/pantheon-updates
Pantheon 7 updates 2022-05-18
2022-05-20 13:12:39 +08:00
Dominik Xaver Hörl 34a1ff28e0 nixos/xmonad: adjust example to reflect v0.17.0 update of xmonad 2022-05-19 18:10:55 +02:00
Bobby Rong c601126bc8
nixos/pantheon: enable power-profiles-daemon
switchboard-plug-power is providing support for this since 2.7.0.

Note that we don't handle the conflict with tlp because we have
no way of knowing which way a user wants to resolve the conflict.
2022-05-18 14:19:53 +08:00
Bobby Rong b93b4f71f2
nixos/pantheon: also treat gnome-font-viewer as non-core apps 2022-05-18 14:19:53 +08:00
Bobby Rong 6f23ca82bd
nixos/pantheon: use pantheon.gnome-settings-daemon
pantheon.gnome-settings-daemon *is* gnome.gnome-settings-daemon338,
doing this so I don't need to update this on every GSD update.
2022-05-18 13:13:54 +08:00
Jan Tojnar ff691ed9ba nixos/gdm: Fix missing icons
Recent `wrapGAppsHook` change stops `adwaita-icon-theme` from being added to `XDG_DATA_DIRS`:
b1e73fa2e0
Since `display-manager.service` does not have `/run/current-system/sw/share` in `XDG_DATA_DIRS`, it does not pick up the globally installed icon theme either, preventing icons from showing.

Let’s make Adwaita available to fix that for now.

Fixes: https://github.com/NixOS/nixpkgs/issues/171692
2022-05-17 00:19:18 +02:00
Silvan Mosberger 486992aca7
Merge pull request #160752 from svrana/desktop-manager-script-start
desktop manager script: start properly
2022-05-12 20:49:13 +02:00
Janne Heß e6fb1e63d1
Merge pull request #171650 from helsinki-systems/feat/config-systemd-package
treewide: pkgs.systemd -> config.systemd.package
2022-05-09 10:23:04 +02:00
Janne Heß 57cd07f3a9
treewide: pkgs.systemd -> config.systemd.package
This ensures there is only one systemd package when e.g. testing the
next systemd version.
2022-05-05 20:00:31 +02:00
Tom Fitzhenry e0daeb01a7 programs/phosh: merge into services/x11/desktop-managers/phosh 2022-05-06 00:04:48 +10:00
Tom Fitzhenry 1d7cd163ce nixos/phosh: add Phosh, the Phone Shell 2022-05-06 00:04:48 +10:00
Jan Tojnar ec0ae174f8 Revert "networkmanager-applet: rename from networkmanagerapplet"
network-manager-applet uses differrent naming scheme from the VPN plug-ins.
Let’s revert to the previous state, for now, to fix eval. We can do the rename later.

This reverts commit cecb014d5d.
2022-05-04 23:29:42 +02:00
Sandro 7e4329608c
Merge pull request #170952 from SuperSandro2000/firewalld
firewalld: init at 1.1.1
2022-05-04 20:51:27 +02:00
José Romildo 417b1c12b2 lxqt: add maintainers team 2022-05-01 13:03:21 -03:00
davidak c60375c5db
Merge pull request #168640 from romildo/upd.enlightenment-team
enlightenment: add maintainers team
2022-05-01 16:32:36 +02:00
José Romildo Malaquias 60a652400b
Merge pull request #170508 from romildo/fix.lxqt
nixos/lxqt: enable libinput
2022-05-01 11:31:51 -03:00
davidak 84bf8a57c1
Merge pull request #168633 from romildo/upd.lumina-team
lumina: add maintainers team
2022-05-01 16:27:40 +02:00
José Romildo 0885172cec nixos/lxqt: enable libinput 2022-05-01 08:55:38 -03:00
davidak ba3762b8be
Merge pull request #170504 from romildo/upd.mate
nixos/mate: enable libinput
2022-05-01 06:10:54 +02:00
Sandro Jäckel cecb014d5d
networkmanager-applet: rename from networkmanagerapplet 2022-04-30 02:26:11 +02:00
Bobby Rong f4f969a484
Merge pull request #170360 from bobby285271/pantheon
Pantheon 7 updates 2022-04-25
2022-04-28 12:44:12 +08:00
Sandro 54b1753b2a
Merge pull request #170505 from romildo/upd.enlightenment
nixos/enlightenment: enable libinput
2022-04-27 18:06:40 +02:00
Sandro bf0457694b
Merge pull request #169144 from romildo/upd.lxqt
lxqt: 1.0.0 -> 1.1.0
2022-04-27 14:54:54 +02:00
Bobby Rong 782683d551
nixos/pantheon: fix outdated wording in docs 2022-04-27 10:18:16 +08:00
José Romildo 0679095c10 nixos/enlightenment: enable libinput 2022-04-26 18:17:46 -03:00
José Romildo 22b2c47866 nixos/mate: enable libinput 2022-04-26 18:08:47 -03:00
Jan Tojnar cd2a6cd9cb nixos/gnome: Add the NixOS background metadata
This is needed to have it listed in the Control Center.
2022-04-21 20:16:41 +02:00
Jan Tojnar 818ac0c9ae Revert "nixos/gnome3: install nixos wallpapers"
There is no need to install them when they will not be picked up
by the Appearance panel of GNOME Control Center without
a XML metadata file anyway.

They will be pulled into the closure via overrides
so that is not a concern either.

This reverts commit 7f3bc5b8fa.
This reverts commit fa607bc939.
2022-04-21 20:00:29 +02:00
José Romildo 2aa95b9fec lxqt.xdg-desktop-portal-lxqt: init at 0.2.0 2022-04-17 22:08:22 -03:00
oxalica 45ba086ea5 nixos/desktop-manager/none: add option to run XDG autostart files
`fcitx5` and `service.earlyoom` rely on use XDG autostart files to start.
But for X session with only window manager and no desktop manager
(`none` is used), no one can start them.

This options is added to run these autostart files for sessions without
desktop manager to make other services just work.
2022-04-18 01:13:59 +08:00
José Romildo 8773488cc8 enlightenment: add maintainers team 2022-04-14 11:28:21 -03:00
José Romildo e132736d0d lumina: add maintainers team 2022-04-14 10:27:47 -03:00
Jan Tojnar 5db9253633 nixos/desktop-managers: Fix eval
nixos/lib/utils.nix is actually passed as `utils` argument to modules
so https://github.com/NixOS/nixpkgs/pull/168194 broke the eval.

Fixes: https://github.com/NixOS/nixpkgs/issues/168569
2022-04-14 06:53:08 +02:00
Jan Tojnar 7eb14b532a nixos/gnome: set default wallpaper for dark mode as well
GNOME 42 needs two wallpaper pictures – for the default (light)
colour scheme and for the dark one. Because we are clearing out
the paths in `gsettings-desktop-schemas` to prevent closure
from bloating, we need to set them in the NixOS module.

Since the wallpaper for the default colour scheme is dark,
will relegate it to the dark colour scheme and switch
to a light blue variant for the default colour scheme.
That one has inverted roundel for the NixOS logo but
it is the only light-ish background that has the logo
of the same size and placing as the dark wallpaper.
2022-04-13 21:29:51 +02:00
Thiago Kenji Okada f1d21bed4d
Merge pull request #168196 from lucasew/fix/xfce-screensaver
nixos/xfce4: option to disable xfce4-screensaver
2022-04-13 14:35:49 +01:00
lucasew e76aa74c28 nixos/xfce: option to disable xfce4-screensaver
Signed-off-by: lucasew <lucas59356@gmail.com>
2022-04-13 09:13:03 -03:00
Sandro a39694b41f
Merge pull request #168194 from SuperSandro2000/xserver-excludePackages
Xserver exclude packages
2022-04-13 11:37:32 +02:00