summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge staging-next into staginggithub-actions[bot]2021-02-17
|\
| * Merge master into staging-nextgithub-actions[bot]2021-02-17
| |\
| | * nixos/hypervGuest: add Microsoft Synthetic Keyboard driverilian2021-02-17
| | * Merge pull request #110615 from jansol/pipewireJörg Thalheim2021-02-17
| | |\
| | | * pipewire: rename pwms to media-sessionJan Solanti2021-02-14
| | | * pipewire: use strictly upstream defaultsJan Solanti2021-02-14
| | | * pipewire: move pipewire-media-session to its own output and moduleJan Solanti2021-02-03
| | | * pipewire: 0.3.20 -> 0.3.21Jan Solanti2021-02-03
| | | * pipewire: 0.3.18 -> 0.3.20Jan Solanti2021-02-03
* | | | Merge staging-next into staginggithub-actions[bot]2021-02-17
|\| | |
| * | | Merge master into staging-nextgithub-actions[bot]2021-02-17
| |\| |
| | * | nixos/bluetooth: hotfix for stupidityPeter Hoeg2021-02-17
| | * | nixos/bluetooth: add support for disabling pluginsPeter Hoeg2021-02-17
* | | | Merge staging-next into staginggithub-actions[bot]2021-02-17
|\| | |
| * | | Merge master into staging-nextgithub-actions[bot]2021-02-17
| |\| |
| | * | Merge pull request #113064 from worldofpeace/fix-108124WORLDofPEACE2021-02-16
| | |\ \
| | | * | nixos/tools: generate an xserver configWORLDofPEACE2021-02-13
| | | * | nixos/tools: make desktopConfiguation types.listOf types.linesWORLDofPEACE2021-02-13
* | | | | Merge staging-next into staginggithub-actions[bot]2021-02-16
|\| | | |
| * | | | Merge master into staging-nextgithub-actions[bot]2021-02-16
| |\| | |
| | * | | mastodon, nixos/mastodon: use the same nodejs package in package and moduleIzorkin2021-02-16
* | | | | Merge staging-next into staginggithub-actions[bot]2021-02-15
|\| | | |
| * | | | Merge master into staging-nextgithub-actions[bot]2021-02-15
| |\| | |
| | * | | Merge pull request #113108 from Ma27/nextcloud-acmeMaximilian Bosch2021-02-15
| | |\ \ \
| | | * | | nixos/nextcloud: fix regex to not return 404 on ACME challengesMaximilian Bosch2021-02-14
| | * | | | Merge pull request #113187 from Ma27/nextcloud-davMaximilian Bosch2021-02-15
| | |\ \ \ \
| | | * | | | nixos/nextcloud: redirect /.well-known/*dav to https urlMaximilian Bosch2021-02-15
* | | | | | | Merge staging-next into staginggithub-actions[bot]2021-02-15
|\| | | | | |
| * | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-15
| |\| | | | |
| | * | | | | Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packagesLassulus2021-02-15
| | |\ \ \ \ \
| | | * | | | | nixos/users: use proper name for per-user packagestv2021-01-23
| | * | | | | | nixos/mastodon: fix mastodon-init-db scriptIzorkin2021-02-15
| | * | | | | | nixos/mastodon: optimize permissionsIzorkin2021-02-15
| | * | | | | | nixos/mastodon: use unix socket to defaultIzorkin2021-02-15
| | * | | | | | nixos/mastodon: add option trustedProxyIzorkin2021-02-15
| | | |/ / / / | | |/| | | |
* | | | | | | Merge staging-next into staginggithub-actions[bot]2021-02-15
|\| | | | | |
| * | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-15
| |\| | | | |
| | * | | | | Merge pull request #111695 from jansol/xowAaron Andersen2021-02-14
| | |\ \ \ \ \
| | | * | | | | xow: fix serviceJan Solanti2021-02-03
* | | | | | | | Merge staging-next into staginggithub-actions[bot]2021-02-14
|\| | | | | | |
| * | | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-14
| |\| | | | | |
| | * | | | | | Fix typo in the GitLab smtp auth options docsJean-Paul Calderone2021-02-14
| | * | | | | | Merge pull request #112746 from mkg20001/qemu-extra-disksMaciej Krüger2021-02-14
| | |\ \ \ \ \ \
| | | * | | | | | nixosTests.*: update to use virtualisation.fileSystemsMaciej Krüger2021-02-14
| | | * | | | | | qemu-vm: add virtualisation.fileSystems to allow extra vm mountsMaciej Krüger2021-02-11
* | | | | | | | | Merge staging-next into staginggithub-actions[bot]2021-02-14
|\| | | | | | | |
| * | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-02-14
| |\| | | | | | |
| | * | | | | | | nixos/switcheroo-control: add to modules-list.nix (#113052)pasqui232021-02-14
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'master' into staging-nextMartin Weinelt2021-02-14
| |\| | | | | |
| | * | | | | | nixos/podman: install systemd fileszowoq2021-02-14