summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism:stockholmnin2018-02-117-39/+214
|\
| * j vim.nix: remap tt to GoTestjeschli2018-02-091-0/+1
| * j bln: +termitejeschli2018-02-081-0/+1
| * j vim: +trailing White detection; *cosmeticsjeschli2018-02-071-1/+5
| * j fontsize default 12; bln 20jeschli2018-01-312-32/+38
| * j bln: +elmjeschli2018-01-311-0/+1
| * j bln: +stockijeschli2018-01-311-6/+9
| * j: +zshjeschli2018-01-312-0/+139
| * j enklave +taskserverjeschli2018-01-312-0/+20
* | Merge remote-tracking branch 'prism/master'nin2018-01-3011-59/+372
|\|
| * jeschli bolide: +j std configjeschli2018-01-281-88/+96
| * jeschli vim: +vim-elmjeschli2018-01-281-1/+9
| * jeschli brauerei: +aliasesjeschli2018-01-231-0/+7
| * j vim: refactoringjeschli2018-01-231-56/+92
| * Merge branch 'master' of prism.i:stockholmjeschli2018-01-215-0/+84
| |\
| | * Merge branch 'staging/jeschli' of prism.r:stockholmjeschli2018-01-192-0/+24
| | |\
| | | * j bln: +virtualboxMarkus Hihn2018-01-192-0/+24
| | | * Merge branch 'master' of prism.r:stockholmMarkus Hihn2018-01-171-2/+2
| | | |\
| | * | | jeschli: +IMjeschli2018-01-191-0/+56
| | * | | Merge branch 'master' of prism.r:stockholmjeschli2018-01-191-2/+2
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | * | jeschli: +irc aliasjeschli2018-01-121-0/+3
| | * | jeschli enklave: import IMwjeschli2018-01-121-0/+1
| * | | j: +bolidejeschli2018-01-213-0/+170
| | |/ | |/|
| * | Merge remote-tracking branch 'prism/master'tv2018-01-168-3/+72
| |\|
| * | tv vim: mkdirs -> need-dirstv2018-01-161-2/+2
* | | Merge branch 'master' of prism:stockholmnin2018-01-1116-19/+111
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-108-3/+72
| |\ \ | | |/ | |/|
| | * jeschli retiolum: connect to enklavejeschli2018-01-101-0/+4
| | * jeschli: +enklave.rjeschli2018-01-103-0/+64
| | * jeschli: set default hostnamejeschli2018-01-103-2/+2
| | * jeschli: meltdown fixMarkus Hihn2018-01-092-1/+2
| * | Merge remote-tracking branch 'prism/master'tv2018-01-098-6/+137
| |\|
| | * 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
| | | |\ \
| | * | \ \ 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
| | | |/ / / | | |/| | |
| * | | | | mv nixpkgs: d0f0657 -> 0653b73tv2018-01-091-1/+1
| | |_|_|/ | |/| | |
| * | | | 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