summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into staging/17.09lassulus2017-10-014-9/+10
|\
| * l hosts: update android rsa keylassulus2017-10-011-1/+1
| * l authorized lass-android for weechatlassulus2017-10-012-9/+5
| * l users: add lass-androidlassulus2017-10-012-0/+5
* | l nixpkgs: 670b4e2 -> 5ac8389lassulus2017-10-011-1/+1
* | Merge branch 'master' into staging/17.09lassulus2017-10-0198-670/+2424
|\|
| * ma tools: disable skypemakefu2017-10-012-2/+1
| * Merge remote-tracking branch 'lass/master'makefu2017-10-019-18/+18
| |\
| | * #krebs@irc.r -> #xxx@irc.rlassulus2017-10-013-3/+3
| | * l #krebs@irc.r -> #xxx@irc.rlassulus2017-10-013-4/+4
| | * tv gitrepos: ni.r/#retiolum -> irc.r/#krebstv2017-10-011-2/+2
| | * #retiolum@ni.r -> #krebs@irc.rlassulus2017-10-013-6/+6
| | * l: #retiolum@ni.r -> #krebs@irc.rlassulus2017-10-015-10/+10
| * | ma: #retiolum -> #xxxmakefu2017-10-013-3/+3
| * | ma cake.r: initmakefu2017-10-013-0/+48
| * | ma irc: ni.r -> irc.rmakefu2017-10-014-4/+5
| |/
| * htodog.r: add irc.rlassulus2017-10-012-0/+2
| * puyak.r: merge multiple boot configslassulus2017-10-011-6/+5
| * puyak.r: fix syntaxlassulus2017-09-301-1/+1
| * l Reaktors: archprism.r -> prism.rlassulus2017-09-303-16/+32
| * l vim: add vimPlugins.vim-golassulus2017-09-301-0/+1
| * l vim: use python3.5 flake8lassulus2017-09-301-1/+1
| * l git: add nix-user-chroot repolassulus2017-09-301-0/+4
| * l exim-smarthost: add aplle & coinbase maillassulus2017-09-301-0/+2
| * l helios.r: add pkgs.aglassulus2017-09-301-0/+1
| * l helios.r: enable redislassulus2017-09-301-1/+10
| * add new prism.r binary-cache keylassulus2017-09-302-0/+2
| * l prism.r: cleanup & adapt to new HWlassulus2017-09-303-194/+147
| * l: add archprism.rlassulus2017-09-303-1/+373
| * Merge remote-tracking branch 'ni/master'lassulus2017-09-306-14/+80
| |\
| | * mv nixpkgs: 56da88a -> 3d04a55tv2017-09-251-1/+1
| | * git-preview: inittv2017-09-221-0/+17
| | * shell: inline utils.deploytv2017-09-211-11/+6
| | * tv modules: s/_://tv2017-09-211-2/+0
| | * iana-etc module: inittv2017-09-212-0/+56
| * | ma pkgs.logstash-input-rss: initmakefu2017-09-291-0/+31
| * | ma wbob: enable extended loggingmakefu2017-09-291-2/+104
| * | ma: enable remote-build on gum,omo - x is mastermakefu2017-09-293-1/+10
| * | ma led-fader: wait for mosquittomakefu2017-09-291-2/+2
| * | ma git: init europastatsmakefu2017-09-291-0/+1
| * | ma gui: do not run pulseaudio system-widemakefu2017-09-291-1/+1
| * | ma stats/server: announce errors into #noisemakefu2017-09-291-2/+4
| * | ma tools/steam: install steam for makefu, not all usersmakefu2017-09-291-1/+1
| * | ma vim: add remarks about vim-nixmakefu2017-09-291-0/+1
| * | ma vpn/openvpn-server: retabmakefu2017-09-291-4/+4
| * | ma modules.wvdial: remove (cherry-picked module from lassmakefu2017-09-292-71/+0
| * | ma remote-build: init configmakefu2017-09-292-0/+25
| * | ma source: bump revmakefu2017-09-291-3/+6
| * | ma latte.r: initmakefu2017-09-293-0/+89
| * | Merge remote-tracking branch 'lass/master'makefu2017-09-2934-287/+582
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 11:09:58 +0000