summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* jeschli: +enklave.rjeschli2018-01-103-0/+64
* jeschli: set default hostnamejeschli2018-01-103-2/+2
* jeschli: meltdown fixMarkus Hihn2018-01-092-1/+2
* Merge branch 'master' of prism.r:stockholmjeschli2018-01-0512-13/+160
|\
| * Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-053-4/+12
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2018-01-045-11/+26
| |\ \
| | * | tv: use pkgs.linuxPackages_latesttv2018-01-041-0/+2
| | * | tv vim: sh.extraStart add writeAshtv2018-01-041-1/+1
| | * | tv wu: move video driver stuff to w110ertv2018-01-042-6/+17
| | * | tv source: turn dummy_secrets into an argumenttv2018-01-021-4/+6
| * | | nin axon: set up ssh keysnin2018-01-032-1/+3
| * | | nin 1 axon config: remove steam partitionnin2018-01-031-4/+0
| * | | nin axon: initnin2018-01-022-0/+125
| |/ /
| * | Merge remote-tracking branch 'prism/staging/test'tv2017-12-2715-474/+522
| |\ \
| | * \ Merge remote-tracking branch 'ni/master' into staging/testlassulus2017-12-253-0/+9
| | |\ \
| * | | | tv nixpkgs: d0f0657 -> 53e6d67tv2017-12-271-1/+1
| | |/ / | |/| |
| * | | tv querel: add chromium with flashtv2017-12-221-0/+3
| * | | tv exim-*: add eximlogtv2017-12-212-0/+6
* | | | Merge branch 'staging/jeschli' of prism.r:stockholmjeschli2018-01-051-2/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | jeschli bln: +tigMarkus Hihn2018-01-051-0/+1
| * | | jeschli bln: activated nm againMarkus Hihn2018-01-051-2/+2
| * | | Merge branch 'staging/jeschli' of prism.r:stockholmMarkus Hihn2018-01-052-2/+2
| |\ \ \
| * | | | jeschli bln: wireless for 34c3Markus Hihn2017-12-271-2/+2
| * | | | jeschli bln: gh/gd aliasesMarkus Hihn2017-12-231-1/+5
| * | | | Merge branch 'master' of prism.r:stockholmMarkus Hihn2017-12-202-38/+71
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | jeschli bln: +sqlite, datagripMarkus Hihn2017-12-201-0/+3
* | | | | jeschli urxvt: got better eyes now - adjust font sizejeschli2018-01-051-1/+1
| |_|/ / |/| | |
* | | | jeschli nixpkgs: f9390d6 -> d83c808jeschli2018-01-042-2/+2
| |/ / |/| |
* | | jeschli brauerei: +user.jamiejeschli2017-12-161-0/+4
* | | jeschli urxvt: *font-sizejeschli2017-12-161-1/+1
* | | jeschli brauerei: +jetbrainsjeschli2017-12-161-0/+3
* | | jeschli urxvt: enable xressourcesjeschli2017-12-151-1/+1
* | | jeschli brauerei.r: bootstrapjeschli2017-12-151-36/+62
|/ /
* | jeschli:+urxvtMarkus Hihn2017-12-151-0/+34
* | Merge branch 'master' of prism.r:stockholmMarkus Hihn2017-12-1511-7/+175
|\ \
| * | jeschli: add brauerei.rlassulus2017-12-153-0/+136
| * | jeschli: add empty dummy-secretslassulus2017-12-151-0/+0
| * | jeschli: add blnlassulus2017-12-153-0/+227
| * | jeschli: secrets are in $HOMElassulus2017-12-151-1/+1
| * | jeschli: add vim.nixlassulus2017-12-152-469/+86
| * | Merge remote-tracking branch 'ni/master'lassulus2017-12-151-1/+21
| |\|
| | * types.source: add pass typetv2017-12-151-1/+21
| * | Merge remote-tracking branch 'onondaga/master'lassulus2017-12-154-4/+5
| |\ \ | | |/ | |/|
| | * nin 1 h config: add lmmsnin2017-12-141-0/+1
| | * nin 2 git: change irc announce channelnin2017-12-141-2/+2
| | * nin 1 h config: delete skypenin2017-12-141-1/+0
| | * n nixpkgs: cfafd6f -> afe9649nin2017-12-141-1/+1
| | * Merge remote-tracking branch 'prism/master'nin2017-12-1426-1059/+942
| | |\
| | * | n 2 default: add nixos binary cachenin2017-11-091-0/+1
| | * | Merge remote-tracking branch 'prism/master'nin2017-11-073-9/+33
| | |\ \