summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ma bureautomation: set service name for google_say to fix regressionmakefu2019-10-291-8/+10
* ma phpfpm: set listen.owner in configmakefu2019-10-282-0/+2
* rtorrent module: set listen.owner in phpfpmmakefu2019-10-281-3/+2
* shack/muellshack: mkYarnPackage is not vendored anymore, using pkgs.yarn2nix-...makefu2019-10-281-1/+1
* Merge remote-tracking branch 'lass/master'makefu2019-10-2740-230/+1021
|\
| * reaktor2: fix invalid character crashlassulus2019-10-231-0/+3
| * Merge remote-tracking branch 'enklave/master'lassulus2019-10-2218-26/+999
| |\
| | * j reagenzglas: change formatingJeschli2019-10-221-13/+14
| | * j emacs: remove ido add helmJeschli2019-10-212-11/+25
| | * j: add firefox overlay made by luisJeschli2019-10-2115-1/+957
| | * j emacs: synaptics -> libinput ; disableWhileTyping = True;Jeschli2019-10-211-1/+3
| * | external: change palos ssh keyIngolf Wagner2019-10-211-1/+1
| |/
| * l: remove deprecated users & keyslassulus2019-10-1715-187/+1
| * l browsers: generate correct browser-select scriptlassulus2019-10-161-1/+1
| * Merge remote-tracking branch 'ni/master'lassulus2019-10-164-3/+7
| |\
| | * tv: explicitly disable libinputtv2019-10-163-0/+5
| | * krebs exim-smarthost: update eloop addressestv2019-10-021-3/+2
| * | Merge remote-tracking branch 'gum/19.09'lassulus2019-10-1616-111/+154
| |\ \
| * | | external: remove kruck and add sterni to retiolumIngolf Wagner2019-10-151-13/+10
* | | | ma pkgs._4nxci: bump to 4.03makefu2019-10-171-2/+2
| |/ / |/| |
* | | ma pkgs.uhub: bump upstream to mastermakefu2019-10-161-0/+48
* | | ma nginx: make linter happymakefu2019-10-152-1/+5
* | | ma nginx/euer.wiki: use settings instead of extraConfig all the way downmakefu2019-10-151-7/+6
* | | shack/muell_mail: use callPackagemakefu2019-10-151-1/+1
* | | ma nginx/euer.wiki: poolConfigs -> poolsmakefu2019-10-152-31/+31
* | | shack/prometheus: use alertmanagers instead of alertmanagerURLmakefu2019-10-151-1/+6
* | | ma krops: update home-managermakefu2019-10-151-1/+1
* | | rtorrent module: switch from poolConfigs to pools for phpfpmmakefu2019-10-151-12/+12
* | | ma owncloud: re-enable secrets, add dummy secretmakefu2019-10-152-22/+24
* | | shack/muell_mail: mkYarnPackage comes from yarn2nix nowmakefu2019-10-151-2/+2
* | | ma: fix warnings and errors for 19.09makefu2019-10-155-11/+11
* | | ma x.r: cleanupmakefu2019-10-152-26/+11
|/ /
* | Merge remote-tracking branch 'enklave/master' into 19.0919.09lassulus2019-10-146-32/+49
|\ \
| * | j: add seperate rust configjeschli2019-10-082-0/+8
| * | j reagenzglas: add silversearcherJeschli2019-09-301-0/+1
| * | j reagenzglas: fix krebs.build.hostJeschli2019-09-301-1/+1
| * | j reagenzglas: include pythonJeschli2019-09-301-0/+1
| * | j reagenzglas: remove own pre krops deploy skriptJeschli2019-09-301-20/+1
| * | j krops: extract target to argument of deployJeschli2019-09-301-2/+2
| * | j: extract python development into seperate nix fileJeschli2019-09-301-0/+9
| * | j emacs: use nix-community overlay (needs 20.03)jeschli2019-09-281-9/+26
* | | l krops: don't override source in testslassulus2019-10-141-1/+1
* | | l: add pkgs.otpmenulassulus2019-10-141-0/+10
* | | l morpheus.r: RIPlassulus2019-10-143-109/+0
* | | Merge remote-tracking branch 'gum/19.09' into 19.09lassulus2019-10-1420-82/+173
|\ \ \
| * | | ma 5pkgs: debug for 19.09 releasemakefu2019-10-145-26/+51
| * | | nixpkgs: 88bbb3c -> 7952807makefu2019-10-141-3/+3
| * | | Merge remote-tracking branch 'lass/19.09' into 19.09makefu2019-10-1448-538/+4146
| |\ \ \
| * | | | ma pigstarter: revive dead links in vulnerability disclosuresmakefu2019-10-131-1/+1
| * | | | glados/wasser: water for 20 seconds instead of 10makefu2019-10-131-1/+1