Commit Graph

13520 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
Sandro
911a73340c
Merge pull request #175335 from wyndon/init-lokinet 2022-07-01 11:54:38 +02:00
ckie
a8c2879f43
Merge pull request #179425 from McSinyx/phylactery
phylactery: init at 0.1.1
2022-06-30 18:29:19 +03:00
Domen Kožar
989565d676 cachix-agent: expose verbose option 2022-06-30 09:56:28 -05:00
wyndon
69e1e00ebb
nixos/lokinet: init 2022-06-30 16:01:50 +02:00
Nguyễn Gia Phong
f5f338c846
nixos/phylactery: init 2022-06-30 22:50:08 +09:00
José Romildo Malaquias
f72be3af76
Merge pull request #179220 from romildo/fix.xfconf
nixos/xfconf: init
2022-06-30 07:39:27 -03:00
Domen Kožar
5a14883a5f
Merge pull request #179634 from domenkozar/cachix-agent-avoid-restarts
cachix-agent: properly handle not restarting the service
2022-06-29 17:37:00 -05:00
Domen Kožar
c7b135ac8e cachix-agent: properly handle not restarting the service 2022-06-29 17:17:35 -05:00
Sandro
a59be4f6c8
Merge pull request #175919 from phaer/phaer-healthchecks
healthchecks: init at 2.2.1
2022-06-29 23:15:35 +02:00
Lin Jian
d1b90cf540
nixos/caddy: force caddy to reload config in ExecReload
This patch follows an upstream commit[1].

Before this patch, if acme module is used, caddy will still use an old
cert even a new one is available. The cause is that without --force
flag, caddy will not reload an unchanged config.

Refer to that commit[1] message for more information.

[1]: 979e498d6d
2022-06-29 10:36:24 +08:00
ajs124
aea940da63 nixos/jitsi-meet: move prosodyctl calls into prosody preStart 2022-06-29 00:19:57 +02:00
Artturi
3cff3f75b4
Merge pull request #166340 from max-privatevoid/patch-6 2022-06-28 19:55:10 +03:00
Alyssa Ross
4684ff771e
nixos/dictd: make dict use local server
Seems silly to install this for use with the local server, but to not
configure it to use the local server.  Otherwise, out of the box we
just get an error about no server being configured.
2022-06-28 12:22:45 +00:00
Sandro
6dce91f57b
Merge pull request #178336 from astro/openwebrx 2022-06-28 11:36:27 +02:00
phaer
12d45dc313 healthchecks: init at 2.2.1 2022-06-28 10:28:46 +02:00
happysalada
b90fa9940b dgraph: add module 2022-06-28 02:34:54 -04:00
Astro
9123ed5f36 openwebrx: 1.1.0 -> 1.2.0 2022-06-28 00:46:32 +02:00
Pascal Bach
13df7151e1
Merge pull request #178783 from greizgh/fix-syncthing-doc
nixos/syncthing: fix services.syncthing.folders description
2022-06-27 22:37:56 +02:00
Kim Lindberger
8b404a1617
Merge pull request #177783 from talyz/parsedmarc-secrets
parsedmarc, geoipupdate: Improve secrets handling and more
2022-06-27 15:26:10 +02:00
Maximilian Bosch
ec5b885d95
Merge pull request #179236 from winterqt/nextcloud-improvements
nixos/nextcloud: some small improvements
2022-06-27 13:42:44 +02:00
Sandro
2cf13724e1
Merge pull request #168141 from mausch/radarr 2022-06-27 01:06:15 +02:00
Aaron Andersen
e3e82b92e8
Merge pull request #177106 from martinetd/logrotate
logrotate: do not add mail if 'mail = false' is specified
2022-06-26 23:39:38 +02:00
Aaron Andersen
bf5781e639
Merge pull request #151642 from antifuchs/fix-151550
navidrome: Allow read access to /etc
2022-06-26 23:32:18 +02:00
Aaron Andersen
28562b800e
Merge pull request #178154 from aanderse/nixos/prosody
nixos/prosody: conditionally provision required directories with StateDirectory
2022-06-26 22:45:18 +02:00
Winter
d6f59779c6 nixos/nextcloud: remove extraneous nginx config directive 2022-06-26 14:30:59 -04:00
Winter
e54ddddd2a nixos/nextcloud: make all services run after nextcloud-setup 2022-06-26 14:29:59 -04:00
Winter
6be3ce36b6 nixos/nextcloud: use mkOption.default for datadir 2022-06-26 14:27:03 -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
Erik Arvstedt
1a32663efc
treewide: rename maintainer earvstedt -> erikarvstedt
The maintainer name now matches the Github username, which simplifies
maintainer notifications.
2022-06-26 19:12:18 +02:00
Lassulus
ea532fe833
Merge pull request #179168 from yayayayaka/revert-177536-hedgedoc-fix-statedirectory 2022-06-26 19:05:04 +02: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
Yaya
57617daaff
Revert "nixos/hedgedoc: Do not set StateDirectory to an absolute path" 2022-06-26 12:06:36 +02:00
Bernardo Meurer
83801da137
Merge pull request #176979 from winterqt/nginx-per-location-recommended-proxy-settings
nixos/nginx: allow recommended proxy settings to be enabled per location
2022-06-25 23:48:29 -07:00
piegames
aa3641fa90
Merge pull request #178838 from mweinelt/matrix-appservice-irc
nixos/matrix-appservice-irc: wait for postgres to start
2022-06-25 23:09:36 +02:00
Thomas Depierre
fc658c86f7 riak, nixos/riak: remove
Riak have been updated a lot since the version 2.2 (now 3.0.10) but
has seen no updated to the package. This is at this point
a problem forcing us to maintain old versions of erlang.

We would be happy to re accept a newer version of Riak if someone want
to spend the time to set it up.
2022-06-25 15:51:18 -04:00
Kim Lindberger
5710bac2b4
nixos/gitlab: Use Git 2.35.x to work around git bug (#177776)
Git 2.36.1 seemingly contains a commit-graph related bug which is
easily triggered through GitLab, so let's downgrade it to 2.35.x until
this issue is solved. See
https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101.
2022-06-25 21:22:53 +02:00
Thiago Kenji Okada
66e8dceabc
Merge pull request #167907 from Misterio77/argonone-module
nixos/argonone: init
2022-06-25 10:48:22 +01:00
Gabriel Fontes
17fc78ea58
nixos/argonone: init 2022-06-24 21:20:32 -03:00
ajs124
5c39c81260
Merge pull request #176702 from Mic92/tt-rss
tt-rss: downgrade to php 8.0
2022-06-25 00:29:11 +02:00
Martin Weinelt
a24431e56f
Merge pull request #162808 from mweinelt/schleuder
schleuder: init
2022-06-24 21:38:22 +02:00
Linus Heckemann
1dabedae3e nixos/schleuder: init module and accompanying test
Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
Co-Authored-By: Cole Helbling <cole.helbling@determinate.systems>
2022-06-24 15:30:16 -04:00
Sandro
74ea995b11
Merge pull request #174446 from jsimonetti/routedns-init
routedns: init at 0.1.5
2022-06-24 16:31:03 +02:00
Martin Weinelt
6c1f44b3f1
nixos/matrix-appservice-irc: wait for postgres to start
Closes: #178692
2022-06-24 08:37:43 +02:00
Lassulus
8c2e25e98e
Merge pull request #177081 from azahi/trickster
trickster: 0.1.10 -> 1.1.5
2022-06-23 22:24:54 +02:00
Greizgh
ac1e34f0fe
nixos/syncthing: fix services.syncthing.folders description
It was improperly referencing overrideDevices instead of overrideFolders.
2022-06-23 20:44:59 +02:00
Bernardo Meurer
5332bc174a
Merge pull request #178483 from twitchyliquid64/tailscale-networkd
tailscale: ignore tailscale link when using networkd
2022-06-23 12:10:14 -04:00
pennae
db0dcf15c6
Merge pull request #177379 from hercules-ci/markdown-cassandra
nixos/cassandra: Convert option docs to markdown
2022-06-23 08:43:35 +00:00
ajs124
6c189d264e
Merge pull request #177077 from Lassulus/bitlbee_cfgdir
nixos/bitlbee: allow writing to configDir
2022-06-22 19:27:59 +02:00
Martin Weinelt
b15badc6c9
Merge pull request #151241 from andir/hass-reload-on-config-changes 2022-06-22 17:20:43 +02:00
Andreas Rammhold
cfbcf381c2
nixos/home-assistant: reload the daemon when configuration changed
Reload the service when configuration changes. This means that we don't
have a potentially slow startup for every small configuration change.
2022-06-22 16:20:11 +02:00
Lassulus
5308b5b44a
Merge pull request #178194 from spacekitteh/patch-35
xpra: Add the ability to perform a start-desktop
2022-06-22 14:41:15 +02:00
Naïm Favier
4af5c46faa
nixos/dhcpcd: use networking.resolvconf.package
Allow using the appropriate resolver implementation to set DNS entries
(typically systemd-resolved instead of openresolv).
2022-06-21 22:58:44 +02:00
Naïm Favier
953a5bd3dd
nixos/tailscale: use networking.resolvconf.package
Allow using the appropriate resolver implementation to set DNS entries
(typically systemd-resolved instead of openresolv).
2022-06-21 22:58:44 +02:00
Naïm Favier
458ac47a1d
nixos/wg-quick: improve usage with systemd-networkd
Use `networking.resolvconf.package` to allow DNS entries to be set using
the system-wide resolver implementation instead of hardcoding systemd or
openresolv.

Extend the tests by adding DNS entries and making one of the peers use
systemd-networkd (hence systemd-resolved).

Also add a few `networkd`-specific settings.
2022-06-21 22:58:44 +02:00
Tom
3b8a162680 tailscale: ignore tailscale link when using networkd 2022-06-21 13:23:28 -07:00
Robert Hensing
fe11145ec9 nixos/cassandra: Convert option docs to markdown 2022-06-21 13:20:13 +02:00
Robert Hensing
e2c261f2c0
Merge pull request #176146 from pennae/module-docs-markdown
treewide: markdown option docs
2022-06-21 13:16:02 +02:00
Maximilian Bosch
5ab65d9cd1 nixos/prometheus-postfix-exporter: fixes for systemd integration
* Allow the service to read from the journal w/systemd.enable
* Ensure that the service is started after postfix.service
2022-06-20 19:30:59 +02:00
Lassulus
eb013128da
Merge pull request #178195 from dnr/pipewire-systemwide
nixos/pipewire: fix wireplumber with system-wide
2022-06-19 12:42:37 +02:00
Florian Klink
5f297c164e nixos/grafana-agent: add myself as maintainer 2022-06-19 11:50:32 +02:00
Florian Klink
b09836593e nixos/grafana-agent: move remote write config from integrations.prometheus_remote_write to metrics.global.remote_write
remote_write config in integrations.prometheus_remote_write is only
applied for integrations, so static configurations won't get written
anywhere.
2022-06-19 11:50:32 +02:00
Florian Klink
e578b4d3ed nixos/grafana-agent: drop server.{grpc,http}_listen_address,http_listen_port
According to https://grafana.com/docs/agent/latest/upgrade-guide/#v0240,
this has been deprecated/moved to -server.http.address and
-server.grpc.address (accepting ip and port) config options in v0.24.0,
and already listens on localhost and not port 80 by default.
2022-06-19 11:50:31 +02:00
Florian Klink
2cca676e69 nixos/grafana-agent: replace settings.prometheus with settings.metrics
According to https://github.com/grafana/agent/pull/1540, -prometheus.*
flages were deprecated in 0.19.0 in favor of the -metrics.*
counterparts. Same applies to `loki` being renamed to `logs`.

I'm not sure if the config file format is still supported (it could be),
but we shouldn't use deprecated configs.
2022-06-19 11:50:31 +02:00
Sophie Taylor
62494281d8
xpra: fix whitespace 2022-06-19 18:26:10 +10:00
Jörg Thalheim
96b227697f
Merge pull request #177785 from Mic92/navidrome
nixos/navidrome: fixes missing ssl certficates
2022-06-19 07:07:41 +01:00
David Reiss
33163bd0ef nixos/pipewire: fix wireplumber with system-wide 2022-06-18 18:46:41 -07:00
Sophie Taylor
f13c61a3b9
xpra: Add the ability to perform a start-desktop 2022-06-19 11:40:41 +10:00
Aaron Andersen
078a53824e nixos/prosody: provide additional details in the user and group options description 2022-06-18 10:08:08 -04:00
Aaron Andersen
79bfd3c0d0 nixos/prosody: conditionally provision required directories with StateDirectory 2022-06-18 10:05:15 -04:00
Kevin Cox
b2537dc430
Merge pull request #177561 from max-privatevoid/ipfs-dont-leak-config
nixos/ipfs: do not leak config to journal on startup
2022-06-17 19:37:33 -04:00
Max
2a8bf9777d nixos/ipfs: do not leak config to journal on startup
The preStart script for the IPFS service will print parts of the configuration
to stdout (and therefore, the journal) when applying profiles on startup. This
may lead to unwanted disclosure of private information, such as remote pinning
service API keys. Fix by sending stdout to /dev/null.
2022-06-17 23:41:27 +02:00
Sandro
0e6db671a0
Merge pull request #178009 from bbenno/update-gollum
gollum: 5.2.3 -> 5.3.0
2022-06-17 21:08:57 +02:00
Benno Bielmeier
be0e2db8b9 nixos/gollum: add option local-time
This feature was introduced in gollum v5.3.0
2022-06-17 12:50:47 +02:00
Benno Bielmeier
9434ac0963 nixos/gollum: improve description of user-icons option 2022-06-17 12:50:13 +02:00
Jörg Thalheim
5d54641d7f
Merge pull request #177790 from superherointj/package-k3s-1.24.1+k3s1
k3s: 1.23.6+k3s1 -> 1.24.1+k3s1
2022-06-17 08:38:10 +01:00
talyz
858a0c3fa6
nixos/parsedmarc: Improve secret handling
Make secret replacement more robust and futureproof:

- Allow any attribute in `services.parsedmarc.settings` to be a
  secret if set to `{ _secret = "/path/to/secret"; }`.

- Hash secret file paths before using them as a placeholders in the
  config file to minimize the risk of conflicting file paths being
  replaced instead.
2022-06-16 13:58:20 +02:00
Lily Foster
b5818b7a30 nixos/pipewire: only add pipewire-pulse.conf conditionally 2022-06-15 15:05:44 -07:00
Lily Foster
1e3747b98b nixos/pipewire: add pkgs.pulseaudio to pipewire-pulse user unit path 2022-06-15 15:05:44 -07:00
superherointj
a6a0c44760 k3s: remove docker support 2022-06-15 16:40:29 -03:00
Jörg Thalheim
c772b13ee7 nixos/navidrome: fixes missing ssl certficates 2022-06-15 20:40:07 +02:00
talyz
32e057881a
nixos/parsedmarc: Remove kafka support
It's broken (see https://github.com/domainaware/parsedmarc/issues/243)
and providing settings for it is therefore misleading.
2022-06-15 20:15:09 +02:00
talyz
6686a3115c
nixos/parsedmarc: Fix compatibility with recent versions of grafana 2022-06-15 20:15:03 +02:00
talyz
4dddca8240
nixos/geoipupdate: Improve secret handling
Make secret replacement more robust and futureproof:

- Allow any attribute in `services.geoipupdate.settings` to be a
  secret if set to `{ _secret = "/path/to/secret"; }`.

- Hash the license key path before using it as a placeholder in the
  config file to minimize the risk of conflicting file paths being
  replaced instead.
2022-06-15 20:14:57 +02:00
talyz
23c15323ce
nixos/geoipupdate: Add error handling to scripts 2022-06-15 17:18:50 +02:00
zimbatm
31b47913f3
nixos: add grafana-agent module
Easily ship logs and metrics to Grafana Cloud and other similar targets.
2022-06-15 12:59:06 +02: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
Lassulus
a632afba6d
Merge pull request #177536 from yayayayaka/hedgedoc-fix-statedirectory
nixos/hedgedoc: Do not set StateDirectory to an absolute path
2022-06-15 11:25:04 +02:00
M. A
becff58579 nixos/hedgedoc: Do not set StateDirectory to an absolute path
Commit 8109d8a set the `StateDirectory=` option of the systemd service
configuration to the value of `cfg.workDir` which is wrong, according
to dasJ [1]. This commit resolves this issue by stripping the
`/var/lib/` prefix from `cfg.workDir`.

[1] https://github.com/NixOS/nixpkgs/pull/172824#issuecomment-1130350412
2022-06-15 08:58:52 +00:00
Andreas
c028f5569b kcheckpass is gone(?) 2022-06-15 14:53:40 +08:00
Jeroen Simonetti
829167bd27
nixos/routedns: init
Signed-off-by: Jeroen Simonetti <jeroen@simonetti.nl>
2022-06-15 08:33:46 +02:00
Niklas Hambüchen
0652ef9a64
Merge pull request #176903 from nh2/vaultwarden-service-better-example
nixos/vaultwarden: Make example more detailed.
2022-06-15 01:21:40 +02:00
Azat Bahawi
82497b0e9f
trickster: 0.1.10 -> 1.1.5 2022-06-14 01:51:45 +03:00
Léo Gaspard
02cd48717d
nixos/openldap: fix systemd rejecting notification (#177084)
On one of the two machines I have running openldap, openldap failed to start due to a "timeout". Increasing the allowed startup delay didn't help.

I noticed the following in logs:
```
openldap.service: Got notification message from PID 5224, but reception only permitted for main PID 5223
```

It turns out that on this machine at least, openldap apparently sends the notification from a non-main process, which means that we need this NotifyAccess setting for systemd to record that it successfully started. Without it, after 30 seconds systemd kills the process because it didn't receive the sd_notify call.

Somehow the other machine I have on nixos running ldap works fine even without this, but I could not figure out what changes the behavior.

Given that AFAIU NotifyAccess still restricts to "from the cgroup of the service", I think this change should be safe.
2022-06-13 15:28:12 +02:00
Maximilian Bosch
7f9a78e197
Merge pull request #175330 from jtojnar/grafana-uid
nixos/grafana: Allow setting UID for datasource
2022-06-13 07:01:19 +02:00
Maximilian Bosch
5203011e4e
Merge pull request #177430 from Ma27/fix-wireguard-exporter
nixos/prometheus-wireguard-exporter: fix broken options
2022-06-13 06:14:30 +02:00
Aaron Andersen
37b6b161e5
Merge pull request #177321 from rnhmjoj/pr-fix-mpd
mpd: fix socket activation
2022-06-12 22:26:53 -04:00
Dominique Martinet
f878c8994f logrotate: do not add mail if 'mail = false' is specified
Reported-by: Ricardo M. Correia <rcorreia@wizy.org>
2022-06-13 08:57:49 +09:00
Winter
6c53004840 nixos/nginx: allow recommended proxy settings to be enabled per location 2022-06-12 19:52:35 -04:00
Maximilian Bosch
e03d41fb6b
nixos/prometheus-wireguard-exporter: fix broken options
This is apparently a breaking change in a patch-level release[1] where
it's now necessary to specify values for each CLI argument.

[1] https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.6.1
2022-06-12 20:27:25 +02:00