summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* nixpkgs-unstable: f5e8bdd -> d3f7e96lassulus2021-03-251-4/+4
* nixpkgs: f8929dc -> d395190lassulus2021-03-251-4/+4
* nixpkgs-unstable: 266dc8c -> f5e8bddlassulus2021-03-231-4/+4
* nixpkgs: 36e15cd -> f8929dclassulus2021-03-231-4/+4
* Merge remote-tracking branch 'gum/master'lassulus2021-03-234-8/+15
|\
| * ma kalauerbot: add support for oofmakefu2021-03-202-3/+11
| * ma bgt/social-to-irc: notifyErrors = falsemakefu2021-03-201-4/+3
| * ma home: move zigbee2mqtt hass config to ham againmakefu2021-03-201-1/+1
| * Merge remote-tracking branch 'lass/master'makefu2021-03-1919-25/+353
| |\
* | \ Merge remote-tracking branch 'ni/master'lassulus2021-03-197-70/+82
|\ \ \
| * | | tv pulse: add au sinktv2021-03-151-0/+15
| * | | tv xmonad: replace Paths by {-pkg-}tv2021-03-154-70/+15
| * | | lib.haskell.substitutePkgs: inittv2021-03-152-0/+52
* | | | Merge remote-tracking branch 'gum/master'lassulus2021-03-1913-193/+112
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | ma git: add oofmakefu2021-03-181-0/+1
| * | ma storj: expose web-uimakefu2021-03-171-1/+19
| * | ma home/ham: pull out zigbee2mqttmakefu2021-03-171-2/+1
| * | ma bureautomation: fix runtime issuesmakefu2021-03-173-119/+28
| * | ma wbob.r: disable kalauerbotmakefu2021-03-171-1/+1
| * | ma bureautomation: prototype philosophische-tuermakefu2021-03-171-69/+59
| * | ma home: move zigbee2mqtt out of hammakefu2021-03-174-1/+2
| * | ma krops: always build fastmakefu2021-03-151-0/+1
* | | brockman: 3.4.0 -> 3.4.3lassulus2021-03-191-2/+2
* | | Merge remote-tracking branch 'gum/master'lassulus2021-03-1771-230/+1111
|\| |
| * | ma pkgs.xmm7360: initmakefu2021-03-121-0/+47
| * | ma etherpad: also move template.mdmakefu2021-03-121-0/+0
| * | ma bureautiomation: init philosophische türmakefu2021-03-121-0/+108
| * | ma krops: add buildTargetmakefu2021-03-121-1/+2
| * | puyak.r: rename interface, use correct subnetmakefu2021-03-121-3/+3
| * | ma share/omo-client: initmakefu2021-03-121-0/+28
| * | ma hw/xmm7360: initmakefu2021-03-121-0/+11
| * | ma ham/signal-rest: initmakefu2021-03-121-0/+18
| * | ma bureautomation/zigbee2mqtt: initmakefu2021-03-122-0/+163
| * | ma wireguard/server: enable persistentKeepalivemakefu2021-03-121-0/+2
| * | ma tools/core: add renamemakefu2021-03-121-0/+1
| * | ma systemdultras/ircbot: disable notificationsmakefu2021-03-121-0/+4
| * | ma stats/server: disable reportingmakefu2021-03-121-0/+1
| * | ma printer: use new ipmakefu2021-03-121-3/+3
| * | ma hw/x230: enable manual fan_controlmakefu2021-03-121-1/+7
| * | ma ham/zigbee2mqtt: enable frontendmakefu2021-03-121-0/+20
| * | ma ham: protect application server from external requestsmakefu2021-03-121-0/+5
| * | ma wbob-kiosk: use gnome instead of xfcemakefu2021-03-121-5/+10
| * | ma etherpad: mv to bgtmakefu2021-03-122-1/+1
| * | ma etherpad: increase timeouts to 30 minutesmakefu2021-03-121-2/+2
| * | ma defaulat: alias ip -> ip -c -brmakefu2021-03-121-0/+1
| * | ma wbob.r: deploy bureautomation with unstable branchmakefu2021-03-122-0/+11
| * | ma binary-cache/server: add port to nix-servemakefu2021-03-121-0/+1
| * | ma backup/server: init backup server repo optionmakefu2021-03-121-6/+14
| * | ma x.r: cleanup inputmakefu2021-03-123-20/+38
| * | ma tsp.r: refactormakefu2021-03-122-3/+17