summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lassul.us/master'makefu2018-11-144-132/+1
|\
| * l: add osmocom@lassul.uslassulus2018-11-111-0/+1
| * remove remaining nin stufflassulus2018-11-113-125/+0
| * Merge remote-tracking branch 'gum/master'lassulus2018-11-104-15/+15
| |\
| * | l prism.r: RIP ninlassulus2018-11-101-7/+0
* | | ma hw/smartcard: disable ifdnfc for nowmakefu2018-11-111-2/+5
| |/ |/|
* | Revert "Revert "ma nixpkgs: 86fb1e9 -> bf46294" ... for now"makefu2018-11-101-4/+4
* | Merge remote-tracking branch 'lassul.us/master'makefu2018-11-1023-107/+110
|\|
| * l realwallpaper: chmod +xlassulus2018-11-101-1/+4
| * l binary-cache: serve under cache.{krebsco.de,lassul.us}lassulus2018-11-101-1/+1
| * l & m: fetchWallpaper: fetch realwallpaper-krebs.pnglassulus2018-11-102-2/+2
| * l realwallpaper: serve realwallpaper-krebs.pnglassulus2018-11-101-4/+1
| * l dns-stuff: sortlassulus2018-11-101-4/+4
| * Merge remote-tracking branch 'ni/master'lassulus2018-11-103-6/+14
| |\
| | * krebs: add youtube@eloop.orgtv2018-11-101-0/+1
| | * Merge remote-tracking branch 'prism/master'tv2018-11-10107-2424/+1570
| | |\
| | * | tv mu: replace disktv2018-11-081-6/+7
| | * | tv q: add utcdatetv2018-11-081-0/+6
| * | | l: add cache.krebsco.de & cache.lassul.uslassulus2018-11-101-0/+2
| | |/ | |/|
| * | Merge remote-tracking branch 'ni/master'lassulus2018-11-101-0/+6
| |\|
| | * krebs.tinc: add tincUpExtratv2018-10-301-0/+6
| * | Merge remote-tracking branch 'nextgum/master'lassulus2018-11-1091-2340/+998
| |\ \
| * \ \ Merge remote-tracking branch 'prism/master'lassulus2018-11-1017-84/+543
| |\ \ \
| | * | | l ejabberd: allow registrationlassulus2018-11-101-2/+2
| | * | | l sqlBackup: remove mysql_passwordlassulus2018-11-101-1/+0
| | * | | l mail: add nix@lassul.us to nix mllassulus2018-11-101-1/+1
| | * | | l git: chmod +x /var/spoollassulus2018-11-101-0/+4
| | * | | l games: add steam-run & dolphinEmu to pkgslassulus2018-11-101-0/+2
| | * | | l: add neocron@lassul.uslassulus2018-11-101-0/+1
| | * | | l ciko: chmod +xlassulus2018-11-101-0/+4
| | * | | l blue: add l-gen-secretslassulus2018-11-101-0/+1
| | * | | l prism.r: new physical hostlassulus2018-11-101-70/+49
| | * | | l prism.r: remove deprecated grub workaroundlassulus2018-11-101-2/+0
| | * | | l archprism.r: new hfos iplassulus2018-11-102-12/+12
| | * | | realwallpaper: e056328 -> 847faeblassulus2018-11-101-2/+2
| | * | | hotdog.r: remove import of gitlab-runner-shackspacelassulus2018-11-101-1/+0
| | * | | nixpkgs: 06fb025 -> bf7930dlassulus2018-11-051-3/+3
| * | | | nixpkgs: 81f5c26 -> 06fb025lassulus2018-10-311-3/+3
* | | | | ma: disable some host cimakefu2018-11-101-10/+10
* | | | | ma secrets: add hass/darksy.apikeymakefu2018-11-101-0/+0
* | | | | airdcpp module: after local-fs.targetmakefu2018-11-101-1/+1
| |_|/ / |/| | |
* | | | Merge remote-tracking branch 'lassul.us/master'makefu2018-11-0530-79/+766
|\ \ \ \
| * | | | nixpkgs: 06fb025 -> bf7930dlassulus2018-11-051-3/+3
| | |/ / | |/| |
| * | | Merge branch 'master' of archprism.r:stockholmlassulus2018-11-050-0/+0
| |\ \ \
| | * | | l: prism.r -> archprism.r, new prism.rlassulus2018-11-043-1/+474
| | |/ /
| * | | nixpkgs: 81f5c26 -> 06fb025lassulus2018-11-041-3/+3
| * | | l baseX: remove broken pkgs.pushlassulus2018-11-041-1/+0
| * | | l: prism.r -> archprism.r, new prism.rlassulus2018-11-043-1/+474
| |/ /
| * | Merge remote-tracking branch 'ni/master'lassulus2018-10-303-3/+6
| |\|
| | * Merge remote-tracking branch 'prism/master'tv2018-10-2775-559/+935
| | |\