summary refs log tree commit diff
path: root/nixos/modules/config
Commit message (Expand)AuthorAge
* treewide: deprecate ip-up.target (#18319)Alexander Ried2016-09-10
* Make the default fonts conditional on services.xserver.enableEelco Dolstra2016-09-05
* Make it possible to disable "info"Eelco Dolstra2016-09-05
* Revert "nixos: remove rsync from base install and add explicit path in nixos-...Eelco Dolstra2016-09-05
* Merge commit 'adaee73' from staging into masterTuomas Tynkkynen2016-09-03
|\
| * docdev -> devdocEelco Dolstra2016-09-01
* | Merge staging into masterTuomas Tynkkynen2016-09-01
|\|
| * treewide: stop using fontbhttfVladimír Čunát2016-08-29
* | nixos/…/swap.nix: add some safety assertions for randomEncryptionobadz2016-08-31
* | Merge pull request #18160 from obadz/swap-encryptionNikolay Amiantov2016-08-31
|\ \
| * | nixos/…/swap.nix: remove backslashes from deviceNameobadz2016-08-31
| |/
* / update-users-groups.pl: correctly guard duplicate uids for declarative usersDomen Kožar2016-08-30
|/
* Merge branch 'master' into stagingobadz2016-08-27
|\
| * nixos/pulseaudio: remove stray load-modulesProfpatsch2016-08-25
* | Merge remote-tracking branch 'origin/master' into hardened-stdenvFranz Pletz2016-08-24
|\|
| * ldap: Add option for NSS integrationMarkus Mueller2016-08-23
| * ldap: Add option for login PAM integrationMarkus Mueller2016-08-23
| * freetype: re-add infinality patchesNikolay Amiantov2016-08-20
| * freetype: 2.6.2 -> 2.6.5cmfwyp2016-08-20
| * fontconfig-ultimate: 2015-12-06 -> 2016-04-23Nikolay Amiantov2016-08-20
| * fontconfig module: respect upstream definitionsEric Sagnes2016-08-20
| * fontconfig: fix etc priorityEric Sagnes2016-08-20
| * modprobe service: drop kmod wrapperNikolay Amiantov2016-08-19
| * Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"Shea Levy2016-08-15
| * modprobe service: drop kmod wrapperNikolay Amiantov2016-08-16
* | Revert "Remove lsh, broken & unmaintained"Robin Gloster2016-08-23
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-12
|\|
| * nixos: remove rsync from base install and add explicit path in nixos-installobadz2016-08-09
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-31
|\|
| * nixos/pulseaudio: increase service restart timeProfpatsch2016-07-30
| * nixos/pulseaudio: tcp streaming & zeroconfProfpatsch2016-07-30
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-25
|\|
| * pulseaudio module: add extraClientConf optionJiri Marsicek2016-07-19
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-19
|\|
| * Merge pull request #15840 from anderspapitto/pulse-jackJoachim F2016-07-16
| |\
| | * pulseaudio: set DISPLAYAnders Papitto2016-07-05
| * | Revert "fontconfig: fix etc priority"obadz2016-07-15
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-15
|\| |
| * | fontconfig: fix etc priorityEric Sagnes2016-07-09
| * | Merge branch 'master' into stagingNikolay Amiantov2016-07-08
| |\ \
| | * | nixos/swap: support for resizing swapfileBjørn Forsman2016-07-06
| | |/
| * | Merge branch 'kbd-paths' into stagingNikolay Amiantov2016-07-08
| |\ \ | | |/ | |/|
| | * kbd: split keymaps into kbdKeymapsNikolay Amiantov2016-07-08
| | * kbd service: add system-wise console resourcesNikolay Amiantov2016-07-08
| * | nixos/update-users-groups.pl: print UIDs and GIDsBjørn Forsman2016-07-01
| |/
| * modules/users-groups: add shell exampleProfpatsch2016-06-25
| * Merge pull request #16189 from zimbatm/usershell-configzimbatm2016-06-19
| |\
| | * Use shell packages to select the user's shellzimbatm2016-06-12
| * | nixos: remove the grsecurity GIDJoachim Fasting2016-06-14
| |/
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-05-30
|\|