summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of http://cgit.ni/stockholmmakefu2018-01-098-14/+17
|\
| * makefu collected-base: .retiolum -> .rtv2018-01-091-2/+2
| * makefu bepasty-dual: .retiolum -> .rtv2018-01-091-1/+4
| * lass bepasty: .retiolum -> .rtv2018-01-091-1/+4
| * makefu euer.wiki: .retiolum -> .rtv2018-01-091-1/+1
| * ircd: .retiolum -> .rtv2018-01-091-2/+2
| * nin: .retiolum -> .rtv2018-01-091-6/+2
| * Merge remote-tracking branch 'prism/master'tv2018-01-0939-71/+466
| |\
| * | mv nixpkgs: d0f0657 -> 0653b73tv2018-01-091-1/+1
| * | tv: add SPF recordtv2018-01-091-0/+1
* | | Merge branch 'master' of prism:stockholmmakefu2018-01-092-2/+2
|\ \ \ | | |/ | |/|
| * | l nixpkgs: 0653b73 -> d202e30lassulus2018-01-091-1/+1
| * | l nixpkgs: 0b30c1d -> 0653b73lassulus2018-01-091-1/+1
| * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-071-1/+1
| |\ \
| | * \ Merge branch 'master' of prism.r:stockholmjeschli2018-01-065-21/+35
| | |\ \
| | * \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-01-0577-287/+930
| | |\ \ \
| | * \ \ \ Merge branch 'staging/jeschli' of prism.r:stockholmjeschli2018-01-0512-41/+209
| | |\ \ \ \
| | * | | | | jeschli urxvt: got better eyes now - adjust font sizejeschli2018-01-051-1/+1
* | | | | | | pkgs.internetarchive: remove fetchPypi, coming from python3Packagesmakefu2018-01-081-1/+1
|/ / / / / /
* | | | | | ma vbob.r: set route after network onlinemakefu2018-01-061-10/+7
* | | | | | Merge remote-tracking branch 'lass/master'makefu2018-01-0622-79/+106
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | l dns: use resolvedlassulus2018-01-061-20/+2
| * | | | | l IM: add rxvt_unicode.terminfolassulus2018-01-061-0/+4
| * | | | | Merge remote-tracking branch 'gum/master'lassulus2018-01-051-1/+2
| |\ \ \ \ \
| * | | | | | l: container hackerylassulus2018-01-052-0/+27
| | |_|_|/ / | |/| | | |
| * | | | | l IM: add bitlbee configlassulus2018-01-051-0/+11
| * | | | | l daedalus.r: add ens* to dhcpcd interfaceslassulus2018-01-051-0/+1
| * | | | | l daedalus.r: enable flashlassulus2018-01-051-0/+1
| * | | | | Merge remote-tracking branch 'gum/master'lassulus2018-01-055-2/+55
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-053-4/+12
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | 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 nixpkgs: f9390d6 -> d83c808jeschli2018-01-042-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-2013-77/+270
| | |\ \ \ \ \
| | * | | | | | jeschli bln: +sqlite, datagripMarkus Hihn2017-12-201-0/+3
| * | | | | | | l mors.r: remove exfat-nofuselassulus2018-01-051-4/+0
| * | | | | | | buildbot slave: don't fail on removelassulus2018-01-051-1/+1
| * | | | | | | l prism.r: repo-sync stockholm every 2 minuteslassulus2018-01-051-0/+7
| * | | | | | | hotdog.r: remove repo-synclassulus2018-01-052-9/+0
| * | | | | | | Merge remote-tracking branch 'ni/master'lassulus2018-01-048-41/+38
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | tv: RIP schnabel*tv2018-01-041-18/+0
| | * | | | | | 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
| | * | | | | | wolf: don't use gone save-diskspacetv2018-01-041-1/+0
| | * | | | | | stockholm: {shell => cmds}.get-versiontv2018-01-021-11/+12
| | * | | | | | Merge remote-tracking branch 'prism/master'tv2018-01-0246-228/+511
| | |\ \ \ \ \ \