Commit graph

1854 commits

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