summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ma vpn: add vpnws client and servermakefu2017-12-182-5/+21
* ma stats: add bamstatsmakefu2017-12-181-0/+35
* ma nginx: add vpn-ws prototypemakefu2017-12-181-0/+35
* Merge branch 'master' of prism:stockholmmakefu2017-12-1860-132/+1409
|\
| * l: hledger -> banklassulus2017-12-182-1/+12
| * l helios.r: ignore lidswitchlassulus2017-12-182-1/+4
| * Merge remote-tracking branch 'prism/staging/jeschli'lassulus2017-12-182-1/+8
| |\
| | * jeschli brauerei: +user.jamiejeschli2017-12-161-0/+4
| | * jeschli urxvt: *font-sizejeschli2017-12-161-1/+1
| | * jeschli brauerei: +jetbrainsjeschli2017-12-161-0/+3
| * | l nixpkgs: cb751f9 -> af7e479lassulus2017-12-181-1/+1
| * | l: get secrets from passlassulus2017-12-181-3/+6
| * | l prism.r: add git to containerslassulus2017-12-181-0/+3
| * | l domsen: cleanup websiteslassulus2017-12-151-19/+4
| * | l dcso-dev: add roblassulus2017-12-151-1/+2
| * | l helios.r: add /tmplassulus2017-12-151-14/+20
| * | l prism.r: enable git for all jeschlislassulus2017-12-151-1/+5
| |/
| * Merge branch 'staging/jeschli' of https://cgit.lassul.us/stockholmjeschli2017-12-150-0/+0
| |\
| | * jeschli:+brauereiMarkus Hihn2017-12-151-0/+3
| * | jeschli: add jeschli-brauerei userjeschli2017-12-151-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
| * xresources: fix api namelassulus2017-12-151-3/+3
| * Merge branch 'master' of prism.r:stockholmMarkus Hihn2017-12-1540-87/+462
| |\
| | * services.xresources -> krebs.xresourceslassulus2017-12-156-5/+5
| | * jeschli: add brauerei.rlassulus2017-12-154-1/+173
| | * jeschli: add empty dummy-secretslassulus2017-12-151-0/+0
| | * jeschli: enable ci & disable externallassulus2017-12-151-4/+0
| | * add jeschli/default.nix (and move stuff from lass/)lassulus2017-12-153-43/+101
| | * jeschli: add blnlassulus2017-12-153-0/+227
| | * jeschli: secrets are in $HOMElassulus2017-12-151-1/+1
| | * jeschli: add vim.nixlassulus2017-12-152-469/+86
| | * l hw: add broadcom driver datalassulus2017-12-151-0/+125
| | * l xserver: fix desktopMangaerlassulus2017-12-151-4/+0
| | * Merge remote-tracking branch 'ni/master'lassulus2017-12-153-7/+33
| | |\
| | | * krebs secrets: use braintv2017-12-151-3/+6
| | | * types.source: add pass typetv2017-12-151-1/+21
| | | * populate: 2.0.0 -> 2.1.0tv2017-12-151-3/+6
| | * | 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-14129-1959/+2812
| | | |\
| | | * | n 2 default: add nixos binary cachenin2017-11-091-0/+1
| | | * | Merge remote-tracking branch 'prism/master'nin2017-11-0712-11/+107
| | | |\ \
| | | * | | n nixpkgs: c99239b -> cfafd6fnin2017-11-071-1/+1
| | * | | | populate: 1.2.5 -> 2.0.0tv2017-12-151-4/+4
| | * | | | krebs save-diskspace: noXlibs? no thanks!tv2017-12-141-1/+0