summary refs log tree commit diff
path: root/nixos/modules/config
Commit message (Collapse)AuthorAge
* fontdir: add ttc to font regexIvan Tham2020-10-26
| | | .ttc fonts are used by noto-fonts-cjk
* nixos/system-path: Add mkpasswd(1)Klemens Nanni2020-10-26
| | | | | Generating password hashes, e.g. when adding new users to the system configuration, should work out-of-the-box and offline.
* Merge pull request #100657 from flokli/network-manager-sstpFlorian Klink2020-10-21
|\ | | | | networkmanager-sstp: init at unstable-2020-04-20, bump sstp from 1.0.12 to 1.0.13
| * nixos/no-x-libs: add networkmanager-sstpFlorian Klink2020-10-21
| |
* | nixos/pam_mount: add pamMount attribute to usersDavid Reiss2020-10-14
| | | | | | | | | | | | | | | | This attribute is a generalized version of cryptHomeLuks for creating an entry in /etc/security/pam_mount.conf.xml. It lets the configuration control all the attributes of the <volume> entry, instead of just the path. The default path remains the value of cryptHomeLuks, for compatibility.
* | Merge master into staging-nextFrederik Rietdijk2020-10-08
|\|
| * Revert "apparmor: fix and improve the service"Vladimír Čunát2020-10-07
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fb6d63f3fdd95a5468d43a0693c8ca7c1894363f. I really hope this finally fixes #99236: evaluation on Hydra. This time I really did check basically the same commit on Hydra: https://hydra.nixos.org/eval/1618011 Right now I don't have energy to find what exactly is wrong in the commit, and it doesn't seem important in comparison to nixos-unstable channel being stuck on a commit over one week old.
* | Merge staging-next into stagingFrederik Rietdijk2020-10-06
|\|
| * nixos/xwayland: add new module and allow configuring a default font pathEmilio Perez2020-10-04
| | | | | | | | | | - Add option `programs.xwayland.defaultFontPath` - Modify sway to enable Xwayland
| * nixos/fontdir: add option to decompress fontsEmilio Perez2020-10-04
| | | | | | | | This will let Xwayland use the global font folder as font path
| * nixos/fontdir: add group of options for fontDirEmilio Perez2020-10-04
| | | | | | | | Renaming enableFontDir to fontDir.enable
| * nixos/fontdir: add the directory to the xserver font pathsrnhmjoj2020-10-04
| |
| * nixos/fontdir: use regexp to find font filesEmilio Perez2020-10-04
| |
| * nixos/fontdir: gather more font formatsEmilio Perez2020-10-04
| | | | | | | | | | | | | | | | - Fix wrong order in which font indexes are created mkfontdir requires the file fonts.scale to consider scalable fonts, thus, mkfontscale should be run before - Search more font formats, in particular, bit-mapped formats
| * nixos/tests: fix x11 testsJonathan Ringer2020-09-30
| |
* | Merge branch 'staging-next' into stagingJan Tojnar2020-09-29
|\|
| * Merge pull request #93457 from ju1m/apparmorMichael Raskin2020-09-27
| |\ | | | | | | apparmor: fix and improve the service
| | * apparmor: fix and improve the serviceJulien Moutinho2020-09-06
| | |
| * | nixos/update-users-groups: /etc/shadow owned by root:shadowCole Helbling2020-09-25
| | |
* | | hooks: add moveSystemdUserUnitsHookRobert Helgesson2020-09-12
|/ / | | | | | | | | | | | | This hook moves systemd user service file from `lib/systemd/user` to `share/systemd/user`. This is to allow systemd to find the user services when installed into a user profile. The `lib/systemd/user` path does not work since `lib` is not in `XDG_DATA_DIRS`.
* | Merge pull request #97171 from davidak/defaultPackagesWORLDofPEACE2020-09-08
|\ \ | | | | | | nixos/config: add defaultPackages option
| * | nixos/config: add defaultPackages optiondavidak2020-09-06
| |/ | | | | | | | | | | | | | | | | readd perl (used in shell scripts), rsync (needed for NixOps) and strace (common debugging tool) they where previously removed in https://github.com/NixOS/nixpkgs/pull/91213 Co-authored-by: Timo Kaufmann <timokau@zoho.com> Co-authored-by: 8573 <8573@users.noreply.github.com>
* | Revert "nixos/fontconfig: fix 50-user.conf handling"Jan Tojnar2020-09-06
| | | | | | | | | | | | | | This reverts commit 8425726f86a2f4a38d0022f3d5cb1d2001da6999. This should have been reverted in https://github.com/NixOS/nixpkgs/pull/95358 but I forgot about it.
* | Merge pull request #95358 from jtojnar/global-fontconfigJan Tojnar2020-09-05
|\ \
| * | fontconfig: get rid of rest of versioned configsJan Tojnar2020-08-29
| | | | | | | | | | | | | | | | | | | | | The incompatibility does not seem to exist any more: programs linked against fc 2.12 on fc 2.14 system seem to at least display text, even while printing tons of errors (as long as you generate fc cache manually), and same thing the other way around. Hopefully it will not be an issue in the future.
* | | Merge pull request #96992 from jtojnar/fc-dtd-urnJan Tojnar2020-09-04
|\ \ \ | |_|/ |/| | treewide: use URN for fontconfig DTD
| * | treewide: use URN for fontconfig DTDJan Tojnar2020-09-03
| | | | | | | | | | | | | | | | | | To match upstream change: https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/9c46ef4aac87c42d013d0e7380b6aeb03e1a9949
* | | Merge pull request #89748 from heinic/krb5-listsJörg Thalheim2020-09-03
|\ \ \
| * | | nixos/krb5: add list to example configurationNico Heitmann2020-08-25
| | | | | | | | | | | | | | | | Updated the relevant nixos test to match the example configuration.
| * | | nixos/krb5: output lists as multiple config entriesNico Heitmann2020-06-07
| | | | | | | | | | | | | | | | Fixes #89626
| * | | nixos/krb5: refactor indentation generationNico Heitmann2020-06-07
| | | | | | | | | | | | | | | | | | | | | | | | mkVal is no longer aware of the indentation depth. Indentation is added to each line of the result when it is included in nested entries.
* | | | treewide: completely remove types.loaOfrnhmjoj2020-09-02
| |_|/ |/| |
* | | Merge pull request #95869 from jtojnar/fc-local-regressionJan Tojnar2020-08-20
|\ \ \ | |_|/ |/| | nixos/fontconfig: fix local.conf regression
| * | nixos/fontconfig: fix local.conf regressionJan Tojnar2020-08-20
| | | | | | | | | | | | | | | | | | Another part of edf2541f02c6b24ea791710d5cadeae36f9b1a3a was missed while rebasing https://github.com/NixOS/nixpkgs/pull/93562, resulting in incorrect path as described by https://github.com/NixOS/nixpkgs/issues/86601#issuecomment-675462227
* | | nixos/systemPackages: clean up (#91213)davidak2020-08-20
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | * nixos/systemPackages: clean up * Update nixos/doc/manual/release-notes/rl-2009.xml Co-authored-by: Jan Tojnar <jtojnar@gmail.com> * Update nixos/doc/manual/release-notes/rl-2009.xml Co-authored-by: 8573 <8573@users.noreply.github.com> Co-authored-by: Jan Tojnar <jtojnar@gmail.com> Co-authored-by: 8573 <8573@users.noreply.github.com>
* | Merge pull request #95681 from flokli/fontconfig-penultimate-removeSilvan Mosberger2020-08-17
|\ \ | | | | | | nixos/fonts: remove fontconfig-penultimate
| * | nixos/fonts/fontconfig-penultimate: remove moduleFlorian Klink2020-08-17
| | |
* | | nixos/fontconfig: fix 50-user.conf handlingFlorian Klink2020-08-17
|/ / | | | | | | | | | | | | | | | | | | | | Apparently, edf2541f02c6b24ea791710d5cadeae36f9b1a3a was missed while rebasing https://github.com/NixOS/nixpkgs/pull/93562. Provide 50-user.conf in fontconfig if includeUserConf is true (the default), and don't try removing the non-existent one if it's disabled Fixes https://github.com/NixOS/nixpkgs/issues/95685 Fixes https://github.com/NixOS/nixpkgs/issues/95712
* | qemu: fix build with environment.noXlibs = trueVladimír Čunát2020-08-16
| | | | | | | | | | | | | | | | | | | | | | In some tests, e.g. -f nixos/release.nix tests.simple.x86_64-linux we use noXlibs and qemu.ga. Now that output is tiny but to get it a full qemu build is done, and some dependencies like gtk3 won't build with noXlibs due to their dependencies being too stripped down. Therefore let's reduce qemu features in noXlibs case. The `sdlSupport = false;` part probably wasn't needed, but I added it for consistency.
* | environment.noXlibs: disable X11 support in cairoBen Wolsieffer2020-08-16
| |
* | nixos/fontconfig: Reintroduce unversioned fonts.confJan Tojnar2020-08-13
| | | | | | | | | | | | Turns out lot of software (including Chromium) use bundled fontconfig so we either need to wrap every one of those, or re-introduce the global unversioned config. The latter is easier but weakens hermetic configs. But perhaps those are not really worth the effort.
* | nixos/fontconfig: stop generating fontconfig_210 config and cacheFlorian Klink2020-08-12
| | | | | | | | This fontconfig version isn't used anywhere inside nixpkgs anymore.
* | nixos/modules: remove trailing whitespaceJörg Thalheim2020-08-07
| | | | | | | | | | This leads to ci failure otherwise if the file gets changed. git-blame can ignore whitespace changes.
* | Merge branch 'master' into staging-nextVladimír Čunát2020-07-22
|\ \ | | | | | | | | | | | | Some rebuilds, e.g. all of haskell. Hydra nixpkgs: ?compare=1601713
| * | nixos/users-groups: don't consider a system with Google OS Login inaccessibleedef2020-07-19
| | | | | | | | | | | | | | | | | | This allows disabling users.mutableUsers without configuring any authentication mechanisms (passwords, authorized SSH keys) other than Google OS Login.
* | | Merge branch 'staging-next' into stagingJan Tojnar2020-07-15
|\| |
| * | nixos.users-groups: Set up subuid/subgid mappings for all normal usersadisbladis2020-07-13
| | | | | | | | | | | | | | | | | | | | | | | | This is required by (among others) Podman to run containers in rootless mode. Other distributions such as Fedora and Ubuntu already set up these mappings. The scheme with a start UID/GID offset starting at 100000 and increasing in 65536 increments is copied from Fedora.
| * | nixos/users-groups: fix mkChangedOptionModule for root password hashRaghav Sood2020-07-12
| | |
* | | Merge pull request #73795 from worldofpeace/fontconfig-2.13.92Jan Tojnar2020-07-13
|\ \ \ | |/ / |/| |
| * | fontconfig: Only read versioned config dirsJan Tojnar2020-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Falling back to unversioned `/etc/fonts/conf.d` when versioned one does not exist is problematic since it only occurs on non-NixOS systems and those are likely to have a different version of fontconfig. When those versions use incompatible elements in the config, apps using fontconfig will crash. Instead, we are now falling back to the in-package `fonts.conf` file that loads both the versioned global `conf.d` directory and the in-package `conf.d` since using upstream settings on non-NixOS is preferable to not being able to use apps there. In fact, we would not even need to link `fonts.conf`, as the in-package `fonts.conf` will be always used unless someone creates the global one manually (the option is still retained if one wants to write a custom NixOS module and to avoid unnecessary stat call on NixOS). Additionally, since the `fonts.conf` will always load `conf.d` from the package, we no longer need to install them to sytem `/etc` in the module. This needed some mucking with `50-user.conf` which disables configs in user directories (a good thing IMO, NixOS module will turn it back on) but otherwise, it is cleaner. The files are still prioritized by their name, regardless of their location. See https://github.com/NixOS/nixpkgs/pull/73795#issuecomment-634370125 for more information.