Commit Graph

31056 Commits

Author SHA1 Message Date
Adam C. Stephens
af4ac075a3
Merge pull request #312523 from emilylange/nixos-forgejo-secrets
nixos/forgejo: refactor secrets, add `cfg.secrets`, forgejo: build `environment-to-ini`, nixos/tests/forgejo: test `cfg.secrets` using /metrics endpoint
2024-06-05 10:01:37 -04:00
a-kenji
406e613b95 nixos/virtualbox-host: fix typo in assertion 2024-06-05 14:04:03 +02:00
Thomas Gerbet
ef6fea2d86 openssh: move Kerberos support into a dedicated package
The `openssh` and `openssh_hpn` packages are now built without
the Kerberos support by default in an effort to reduce the attack surface.

The Kerberos support is likely used only by a fraction of the total users
(I'm guessing mainly users integrating SSH in an Active Directory env) so
dropping it should not impact too many users. It should also be noted that
the Kerberos/GSSAPI auth is disabled by default in the configuration.
`opensshWithKerberos` and `openssh_hpnWithKerberos` are added in order
to provide an easy migration path for users needing this support.

The `openssh_gssapi` package is kept untouched.
2024-06-05 19:45:31 +10:00
Florian Klink
40066ba0d8
Merge pull request #316168 from dawidd6/systemd-user-generators
nixos/systemd: link user-generators
2024-06-05 09:59:29 +02:00
Jörg Thalheim
7d98bbfcd5
Merge pull request #315827 from JohnRTitor/hyprland-module
nixos/{hyprland, wayland-common}: disable wlr portal for hyprland, enable xdg autostart for all wayland compositors
2024-06-05 09:57:53 +02:00
Pol Dellaiera
133aa44c38
Merge pull request #317286 from drupol/open-webui-add-more-env
nixos/{ollama,open-webui}: minor service update
2024-06-05 09:12:28 +02:00
Pol Dellaiera
309451127f
nixos/open-webui: update options default values 2024-06-05 08:05:19 +02:00
Pol Dellaiera
5664bb7899
nixos/open-webui: add example in options 2024-06-05 08:05:18 +02:00
Pol Dellaiera
a8670536e5
nixos/open-webui: remove preStart step
nixos/open-webui: remove `preStart` step
2024-06-05 08:05:18 +02:00
Pol Dellaiera
61ab4de94c
nixos/open-webui: update option and service descriptions 2024-06-05 08:05:18 +02:00
Pol Dellaiera
709eb8ebaf
nixos/open-webui: add openFirewall option 2024-06-05 08:05:18 +02:00
Pol Dellaiera
c54890e226
nixos/ollama: update port option, use types.port 2024-06-05 08:05:18 +02:00
Pol Dellaiera
cb8670469b
nixos/ollama: add openFirewall option 2024-06-05 07:09:13 +02:00
emilylange
694db856ed
nixos/forgejo: refactor secrets, add cfg.secrets
This is not a breaking change. Existing setups continue to work as-is.

Users of `cfg.mailerPasswordFile` will get an option rename/deprecation
warning, but that's it (assuming there is no regression).

This adds `cfg.secrets`, which is a wrapper over systemd's
`LoadCredential=` leveraging Forgejo's `environment-to-ini`.

`environment-to-ini` is intended for configuring Forgejo in OCI
containers.

It requires some fairly annoying escaping of the section names to fit
into the allowed environment variable charset.

E.g. `"log.console".COLORIZE = false` becomes
`FORGEJO__LOG_0x2E_CONSOLE__COLORIZE=false`.

 - `.` needs to be replaced with `_0X2E_` and
 - `-` needs to be replaced with `_0X2D_`

Those are simply the hex representation of each char from an ASCII
table:

. = ASCII 46 = 46 (decimal) = 2E (hex) = 0x2E = _OX2E_

To make interacting with `environment-to-ini` less annoying, we template
and escape the sections/keys in nix:

`cfg.secrets` takes the same free-form sections/keys as `cfg.settings`.
Meaning there is now a generalized abstraction for all keys, not just
those that have been manually implemented in the past.

It goes as far as theoretically allowing one to have `DEFAULT.APP_NAME`
read from a secret file.

I don't know why one would want to do that, but it has been made
possible by this :^)

More reasonable examples are listed in the `cfg.secrets` option example.

We also continue to bootstrap a handful of secrets like
`security.SECRET_KEY`. This is done is a sort of sidecar bootstrap unit
fittingly called `forgejo-secrets.service`.

Overriding those is, just like before, not really intended and requires
the use of `lib.mkForce` and might lead to breakage. But it is, in a
way, more possible than before.
2024-06-05 00:45:59 +02:00
nikstur
1baf7d7e4e
Merge pull request #314890 from danielbarter/repart-image-fix
repart-image: remove --map-root-user flag from unshare
2024-06-04 22:28:05 +02:00
Nick Cao
5032dc9bc3
Merge pull request #317038 from abmantis/patch-5
nixos/nvidia-optimus: add nvidia-modeset to blacklist
2024-06-04 16:10:52 -04:00
Arian van Putten
605418f9b1
Merge pull request #317257 from arianvp/stephank-fix-acme2
nixos/acme: allow setting security.acme.defaults.server = null to keep old accounts directory
2024-06-04 21:58:25 +02:00
K900
840914c324
Merge pull request #317268 from SuperSandro2000/plasma6-cups
nixos/plasma6: make print-manager depend on cups
2024-06-04 22:18:59 +03:00
Maximilian Bosch
7e2210236e
Merge pull request #316004 from Ma27/nc-memlimit
nixos/nextcloud: make memory_limit of nextcloud-cron configurable
2024-06-04 19:18:03 +00:00
Sandro Jäckel
7c39d372f7 nixos/plasma6: make print-manager depend on cups 2024-06-04 20:50:06 +02:00
Stéphan Kochen
d1f07e6382 nixos/acme: allow setting security.acme.defaults.server = null to keep old accounts directory
The accounts directory is based on the hash of the settings.

https://github.com/NixOS/nixpkgs/pull/270221 changed the  default of
security.acme.defaults.server from null to the default letsencrypt URL
however as an unwanted side effect this means the accounts directory
changes and the ACME module will create a new a new account.

This can cause issues with people using CAA records that pin the
account ID or people who have datacenter-scale NixOS deployments

We allow setting this option to null again for people who want
to keep the old account and migrate at their own leisure.

Fixes https://github.com/NixOS/nixpkgs/issues/316608

Co-authored-by: Arian van Putten <arian.vanputten@gmail.com>
2024-06-04 20:09:46 +02:00
Pol Dellaiera
6b6d4aeb35
Merge pull request #316248 from shivaraj-bh/open-webui
open-webui: init at 0.2.4
2024-06-04 15:47:03 +02:00
shivaraj-bh
f66cb82fef nixos/open-webui: init 2024-06-04 16:46:19 +05:30
Jörg Thalheim
c71ebe0dc8 netboot: drop syslinux and grub
The comment says this is required by other modules but to be honest, I
cannot see where. Bootloaders will be included automatically by nixos
generation if their `installBootLoader` attribute references it.

This helps us to make kexec images even smaller espeically when
combined with the perlless profile.
2024-06-04 10:35:20 +02:00
Bobby Rong
6051698052
Merge pull request #314695 from nonetrix/patch-1
nixos/xdg/portal: Fix typo
2024-06-04 13:27:16 +08:00
Daniel Barter
d7a9d49c42 repart-image: removing unshare (and util-linux dep) form systemd-repart invocation
..
2024-06-03 17:48:27 -07:00
Bobby Rong
36bc3f46ba
nixos/pantheon: Do not set QT_QPA_PLATFORMTHEME
7aa79d47f7

Closes #316991
2024-06-04 07:37:56 +08:00
Abílio Costa
79cd2f9738
nixos/nvidia-optimus: add nvidia-modeset to blacklist
The nvidia-modeset module is loaded, which in turn pulls in the nvidia module. This makes bbswitch fail to turn off the card since it would be in use by the module.
2024-06-03 23:18:34 +01:00
Christian Kögler
966d214719 nixos/node-red: fix passthru of PATH 2024-06-03 23:23:38 +02:00
Sandro
43b5ccde57
Merge pull request #316879 from SuperSandro2000/mkEnableOption 2024-06-03 19:03:12 +02:00
Sandro Jäckel
1c2132f714
nixos/installation-cd-plasma5: fix even more aliases 2024-06-03 16:26:54 +02:00
K900
2e8de9bd1a
Merge pull request #316929 from SuperSandro2000/cd-konsole
nixos/installation-cd-plasma5: don't use alias for konsole
2024-06-03 17:25:12 +03:00
Sandro
a88fb925bb
nixos/installation-cd-plasma5: don't use alias for konsole 2024-06-03 16:22:12 +02:00
Michele Guerini Rocco
9e97770a19
Merge pull request #312317 from tom-kuca/replace-existing-network-addresses
nixos/network-interfaces: prevent failure when a network address already exists
2024-06-03 15:30:13 +02:00
Sandro Jäckel
41452802cb
treewide: fix all obviously wrong mkEnableOptions 2024-06-03 13:20:32 +02:00
Sandro
0387dede7c
Merge pull request #316732 from SuperSandro2000/tailscale-auth 2024-06-03 12:49:31 +02:00
Jonas Heinrich
4ce2189082 nixos/davfs2: Remove deprecated extraConfig 2024-06-03 11:36:14 +02:00
Dawid Dziurla
fbbc41f7da
nixos/systemd: simplify hooks function 2024-06-03 11:15:59 +02:00
Florian Klink
c149b8818b
Merge pull request #316836 from srhb/fix-garage-assert
nixos/garage: fix replication 1.0 assertion
2024-06-03 11:14:03 +03:00
Sarah Brofeldt
f7393d13fe nixos/garage: fix replication 1.0 assertion
Use the `cfg.package.version` (string) instead of the entire package so
users don't see  `error: value is a set while a string was expected`
instead of the intended assertion message.
2024-06-03 09:56:42 +02:00
Florian Klink
77a51024c0
Merge pull request #316697 from bbenno/fix-gollum
nixos/gollum: fix systemd tempfile permission
2024-06-03 08:25:04 +03:00
John Titor
de77718887
nixos/wayland-session: cleanup
xwayland, wlr-portal ->
 enable-xwayland, enable-wlr-portal
2024-06-03 09:28:00 +05:30
illustris
da799551a4
nixos/proxmox-lxc: fix console access (#307163)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2024-06-03 00:15:27 +02:00
Sandro
1e8d02875f
Merge pull request #307287 from illustris/proxmox-vma 2024-06-03 00:12:40 +02:00
Someone
e7139eb386
Merge pull request #316516 from aidalgol/libxnvctrl-nixos-fix
nixos/nvidia: add missing check for nvidia settings enabled
2024-06-02 21:32:56 +00:00
Eric Wolf
7c0937d668
nixos/nextcloud-notify_push: use Type=notify
This prevents the post start script from running
before necessary sockets have been created.

It also prevents an unused shell from being kept around
by using `exec` to make `notify_push` the main process.
2024-06-02 23:19:07 +02:00
Sandro
6f02edec1a
Merge pull request #316358 from majewsky/portunus-remove-libxcrypt-legacy 2024-06-02 23:10:26 +02:00
Sandro Jäckel
f643e4fa5b
nixos/tailscale-auth: fix enable option description 2024-06-02 22:30:42 +02:00
Ryan Horiguchi
ea63e59edc nixos/adguardhome: fix typo 2024-06-02 21:01:11 +02:00
h7x4
850cbdd97d
Merge pull request #316648 from s1ls/invidious-router-descfix
nixos/invidious-router: remove redundant "Enables" in description
2024-06-02 19:28:19 +02:00
Benno Bielmeier
b5c7987b52 nixos/gollum: fix systemd tempfile permission
When services.gollum.{user,group} was specified a value other than its
default (i.e. "gollum"), the build failed due to referencing a
non-existing user.
2024-06-02 18:00:19 +02:00
Sandro
56744fd9ee
Merge pull request #312261 from Yarny0/ensure-printers-fix-options 2024-06-02 17:59:01 +02:00
Onur C. Cakmak
b3f70c29d5
nixos/containerd: remove LimitNOFILE from service (#313507) 2024-06-02 17:51:10 +02:00
Sandro
c6c60cca65
Merge pull request #315112 from sikmir/git-daemon 2024-06-02 17:08:43 +02:00
Silas Schöffel
37afbbb602
nixos/invidious-router: remove redundant "Enables" in description 2024-06-02 13:27:22 +02:00
Thomas Gerbet
e12faccb31
Merge pull request #313794 from tcmal/akkoma-3.13.2
akkoma: 3.13.1 -> 3.13.2
2024-06-02 12:57:31 +02:00
Lin Jian
0dd47a00b7
Merge pull request #316500 from acid-bong/emacs
nixos/emacs: simplify the service's ExecStart line
2024-06-02 14:42:35 +08:00
Acid Bong
eacb151e5d
nixos/emacs: simplify the service's ExecStart line
The upstream service just executes `emacs --fg-daemon`.
2024-06-02 09:24:31 +03:00
michaelBelsanti
7f447ce0f8
nixos/espanso: fix espanso options 2024-06-01 18:04:04 -04:00
Aidan Gauland
9b3461e7ae
nixos/nvidia: add missing check for nvidia settings enabled 2024-06-02 09:08:22 +12:00
Guillaume Girol
6ca2cfd75b
Merge pull request #313485 from tpwrules/copytoram-notif
nixos/stage-1-init: notify during copytoram
2024-06-01 21:06:33 +02:00
John Titor
7b2a2824b3
nixos/wayland-session: force running xdg autostart for WM-only sessions 2024-06-01 22:30:19 +05:30
Arnout Engelen
61c1d28215
Merge pull request #303790 from FriedrichAltheide/cleanup-virtualbox
virtualbox & virtualboxGuestAdditions: cleanup
2024-06-01 13:42:14 +02:00
Stefan Majewsky
d11d18df30 portunus: remove libxcrypt-legacy usage 2024-06-01 10:28:21 +02:00
OPNA2608
2735184f6d lomiri.lomiri: Try to consider services.xserver.xkb.layout
Propagate the configuration setting through an envvar, check the envvar in the compositor.
Needed because querying AccountsSettings for this information fails, due to Ubuntu-only
"InputSources" interface. So you're stuck on US layout without this hack.
2024-06-01 00:26:25 +02:00
Yt
e45abe6d47
Merge pull request #313634 from onny/stalwart-systemd
stalwart-mail: package und use upstream systemd unit
2024-05-31 21:11:45 +00:00
Peder Bergebakken Sundt
080af6461e
Merge pull request #314294 from james-atkins/mealie-update
mealie: 1.2.0 -> 1.7.0
2024-05-31 20:41:37 +02:00
WilliButz
4726504fea
Merge pull request #315656 from nikstur/os-release-remove-type-constraints
nixos/version: remove strict type constraints from image options
2024-05-31 14:51:20 +02:00
Maximilian Bosch
66e93e7e43
Merge pull request #316128 from NixOS/revert-315921-networkd-simplify-mkif
Revert "nixos/networking: use mkIfs on the inner attributes"
2024-05-31 12:39:12 +00:00
Francesco Gazzetta
3da336fc79 nixos/ladybird: init 2024-05-31 12:11:43 +00:00
Maximilian Bosch
3cf4304692
Revert "nixos/networking: use mkIfs on the inner attributes" 2024-05-31 13:05:19 +02:00
robin
4b0fd37990
nixos/alsa: fix audio state loading on system start 2024-05-31 11:55:11 +02:00
taku0
49032a79e4
Merge pull request #311669 from Nydragon/add-thunderbird-policies 2024-05-31 18:20:59 +09:00
Jonas Heinrich
336232debd stalwart-mail: package upstream systemd unit 2024-05-31 10:22:15 +02:00
Jonas Heinrich
dfa130e828 nixos/stalwart-mail: use upstream systemd unit 2024-05-31 10:20:47 +02:00
Yt
6606ce9c0c
Merge pull request #273101 from onny/invoiceplane-settings2
nixos/invoiceplane: Remove deprecated extraConfig
2024-05-31 00:04:34 +00:00
Maximilian Bosch
dddd08d188
nixos/nextcloud: make memory_limit of nextcloud-cron configurable
The memory limit is equal to what's configured in php-fpm. Given that we
run in a different environment, it seems reasonable to allow different
memory contraints here.
2024-05-30 23:38:55 +02:00
Maximilian Bosch
a8377e1b0f
Merge pull request #314828 from peterablehmann/prometheus
nixos/prometheus: add query_log_file option
2024-05-30 21:37:26 +00:00
Yt
0509bb8779
Merge pull request #315908 from pacien/nixos-stalwart-default-rocksdb
nixos/stalwart-mail: rocksdb as default storage
2024-05-30 21:31:59 +00:00
Yt
782f9a832e
Merge pull request #315697 from pacien/nixos-stalwart-no-dynamicuser
nixos/stalwart-mail: do not use DynamicUser
2024-05-30 21:27:34 +00:00
Maximilian Bosch
ab294204ba
Merge pull request #315921 from lheckemann/networkd-simplify-mkif
nixos/networking: use mkIfs on the inner attributes
2024-05-30 18:11:51 +00:00
Dawid Dziurla
25ad0cdbfc
nixos/systemd: link user-generators 2024-05-30 19:52:22 +02:00
Dawid Dziurla
156757eaf7
nixos/systemd-user: add generators option 2024-05-30 19:51:42 +02:00
euxane
0174aa1c56 nixos/stalwart-mail: rocksdb as default storage
This sets RocksDB as the default storage backend for `stateVersion` >=
24.11. For previous `stateVersion`s, the structured data and blobs
remain on SQLite and the filesystem respectively.

This is closer to the suggested upstream configuration for fully local
storage.
2024-05-30 16:22:03 +02:00
Seaver Thorn
90b70f368d
nixos/xone: fixed a typo in the option description (#310419) 2024-05-30 14:53:04 +03:00
John Titor
98f9f9951a
nixos/hyprland: add fufexan as maintainer
Per https://github.com/NixOS/nixpkgs/pull/315827#issuecomment-2139073465
2024-05-30 14:25:36 +05:30
Sandro
357ccb3199
Merge pull request #314418 from SuperSandro2000/mopidy-online
nixos/mopidy: add wants network-online.target to fix warning
2024-05-30 10:16:35 +02:00
John Titor
0b0b7cefcc
nixos/hyprland: disable wlr-portal for Hyprland
This commit:
- Adds wlr-portal override of wayland-session module (enabled by default)
- Disable it for hyprland module
2024-05-30 13:30:41 +05:30
Jonas Heinrich
0ef99565a9
Merge pull request #315745 from pacien/nixos-stalwart-default-directory-db
nixos/stalwart-mail: add default account directory
2024-05-30 09:37:30 +02:00
Jonas Heinrich
dfad9bb515
Merge pull request #315710 from pacien/nixos-stalwart-log-update
nixos/stalwart-mail: migrate logging config
2024-05-30 09:34:28 +02:00
Franz Pletz
4e1b4397d9
Merge pull request #312472 from Ma27/networkd-option-rename
nixos/networkd: get rid of *Config attributes in lists
2024-05-30 04:06:01 +02:00
Martin Weinelt
e0f4e4b535
Merge pull request #274425 from woffs/fix-274286
nixos/frr: adapt to frr-9
2024-05-30 02:33:26 +02:00
euxane
ddcbe4c369 nixos/stalwart-mail: add default account directory
This configures a default account directory for the Stalwart service.
It uses the default common database which was already configured.

Without this directory, admins could not manage users and groups using
the `stalwart-cli` tools.
2024-05-30 02:07:17 +02:00
lassulus
d6f07be682
Merge pull request #314889 from DavHau/pr_sshd
nixos/openssh: allow removing settings
2024-05-30 01:01:07 +02:00
euxane
6ee84bcda0 nixos/stalwart-mail: do not use DynamicUser
This service stores a large number of files for its blob store and some
of its databases. This is not compatible with `DynamicUser`, which
`chown`s everything in the state directory every time the service is
started. Therefore, we now use a static system user and group instead.

See https://github.com/NixOS/nixpkgs/pull/313634#discussion_r1609960417
2024-05-30 00:40:12 +02:00
euxane
824949f300 nixos/stalwart-mail: migrate logging config
The logging configuration keys have changed,
which caused this config to be ignored.
2024-05-29 22:17:59 +02:00
Jade Lovelace
83eba84f9e
Merge pull request #315580 from lf-/jade/remove-old-nix-workaround
tree-wide: remove --build-users-group '' workaround for 10 year old Nix bug
2024-05-29 13:05:01 -06:00
Kerstin
daa52e1d9e
Merge pull request #289582 from Izorkin/update-mastodon-redis
nixos/mastodon: update redis host and port configurations
2024-05-29 18:41:20 +02:00
Cosima Neidahl
0db9149e2a
Merge pull request #315627 from OPNA2608/fix/coolercontrold-nvidia-package
nixos/coolercontrol: Use user-preferred nvidia package
2024-05-29 16:44:07 +02:00
nikstur
acba687721 nixos/version: remove strict type constraints from image options
This constraints aren't super useful because they arent really enforced
by the software, so it's hard to get them right and we've gotten them
wrong multiple times in the past. It's better to remove them altogether
in the spirit of RFC 42.
2024-05-29 16:13:41 +02:00