Commit graph

1886 commits

Author SHA1 Message Date
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
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