summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master' into mastertv2020-12-02120-1787/+2021
|\
| * Merge remote-tracking branch 'mic92/master' into masterlassulus2020-11-244-0/+15
| |\
| | * mic92: add shannanJörg Thalheim2020-11-243-0/+14
| | |
| | * add alertmanager.rJörg Thalheim2020-11-231-0/+1
| | |
| * | nixpkgs-unstable: 34ad166 -> a322b32lassulus2020-11-231-4/+7
| |/
| * Merge remote-tracking branch 'ni/master' into masterlassulus2020-11-232-1/+6
| |\
| * \ Merge remote-tracking branch 'gum/master' into masterlassulus2020-11-2352-1292/+1365
| |\ \
| | * | ma hw: tlp.extraConfig -> tlp.settingsmakefu2020-11-181-13/+10
| | | |
| | * | ma ham/light/groups: initmakefu2020-11-182-0/+47
| | | |
| | * | ma editor/vim: use py3k for youcompleteme supportmakefu2020-11-181-3/+1
| | | |
| | * | ma omo.r: zigbee2mqtt is included via hammakefu2020-11-181-1/+0
| | | |
| | * | ma default: remove double-defined tmpmakefu2020-11-181-3/+0
| | | |
| | * | ma gui/base: fix warningsmakefu2020-11-181-2/+4
| | | |
| | * | ma pkgs.hactool: ripmakefu2020-11-181-30/+0
| | | |
| | * | ma snapraid module: fix warning about stringmakefu2020-11-181-1/+1
| | | |
| | * | ma ham/firetv_restart: fix typomakefu2020-11-181-1/+1
| | | |
| | * | ma zigbee2mqtt: add comment about mkForcemakefu2020-11-181-0/+1
| | | |
| | * | ma ham: use new home-assistant merge functionmakefu2020-11-189-331/+342
| | | |
| | * | ma ham/zigbee2mqtt: use upstream modulemakefu2020-11-183-139/+148
| | | |
| | * | ma wireguard/server: remove restart logicmakefu2020-11-181-4/+0
| | | |
| | * | ma sickbeard: use python37makefu2020-11-181-3/+3
| | | |
| | * | ma bureautomation: update teammakefu2020-11-181-16/+22
| | | |
| | * | ma bureautomation: move to 20.09 style importsmakefu2020-11-1829-751/+794
| | | |
| | * | Merge remote-tracking branch 'lass/20.09' into 20.09makefu2020-11-1811-316/+26
| | |\ \
| | * | | ma bgt/download: remove obsolete netdata entrymakefu2020-11-181-11/+3
| | | | |
| | * | | ma download.binaergewitter.de: fix for 20.09makefu2020-11-181-0/+5
| | | | |
| * | | | Merge remote-tracking branch 'mic92/master' into masterlassulus2020-11-231-2/+2
| |\ \ \ \
| | * | | | mic92: fix bernie tinc addressJörg Thalheim2020-11-201-2/+2
| | | | | |
| * | | | | l: init styx.rlassulus2020-11-233-0/+153
| |/ / / /
| * | | | mic92: improve tinc cross-compilingJörg Thalheim2020-11-201-2/+4
| | | | |
| * | | | mic92: add bernieJörg Thalheim2020-11-191-0/+28
| | | | |
| * | | | mic92: add loki.r alias to rock.rJörg Thalheim2020-11-191-1/+4
| | | | |
| * | | | l: fix lib usagelassulus2020-11-191-1/+1
| | | | |
| * | | | remove deprecated hass modulelassulus2020-11-198-87/+36
| | |/ / | |/| |
| * | | Merge remote-tracking branch 'gum/20.09' into 20.0920.09lassulus2020-11-183-12/+29
| |\| |
| | * | ma owncloud: use php.buildEnvmakefu2020-11-171-7/+20
| | | |
| | * | pkgs.alertmanager-bot-telegram: fix vendorSha256makefu2020-11-171-1/+1
| | | |
| | * | puyak.r: disable newsbot for nowmakefu2020-11-171-3/+8
| | | | | | | | | | | | | | | | waiting for brockman
| | * | ma owncloud: disable memcachedmakefu2020-11-171-2/+1
| | | |
| * | | Merge remote-tracking branch 'ni/master' into 20.09lassulus2020-11-171-2/+2
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'ni/master' into 20.09lassulus2020-11-178-300/+4
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'gum/20.09' into 20.09lassulus2020-11-175-51/+10
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | shack/glados: disable dwd_pollenmakefu2020-11-172-48/+3
| | | | | |
| | * | | | Merge remote-tracking branch 'lass/20.09' into 20.09makefu2020-11-173-9/+165
| | |\ \ \ \
| | * | | | | ma hw/tp-x2x0: use utillinux instead of rfkill packagemakefu2020-11-171-1/+1
| | | | | | |
| | * | | | | ma gum.r: disable gitlab-runnermakefu2020-11-171-1/+5
| | | | | | |
| | * | | | | Merge remote-tracking branch 'lass/20.09' into 20.09makefu2020-11-171-8/+8
| | |\ \ \ \ \
| | * | | | | | shack/mqtt_sub: use python3 instead of 3.5makefu2020-11-171-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into 20.09lassulus2020-11-171-1/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'ni/master'lassulus2020-11-171-1/+0
| | |\ \ \ \ \ \ \