summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'tv2017-10-0333-88/+113
|\
| * tinc module: workaround nixpkgs's lib.types.typestv2017-10-031-4/+3
| | | | | | | | Introduced by nixpkgs 152c63c9ff82276e225ac4a4fa71c791d33e443d
| * l weechat: open mosh portlassulus2017-10-031-0/+5
| |
| * l sqlBackup: set mysql.dataDir to /var/mysqllassulus2017-10-031-1/+2
| |
| * nixpkgs: 670b4e2 -> 07ca7b6lassulus2017-10-031-1/+1
| |
| * l copyq: fix startuplassulus2017-10-031-1/+4
| |
| * l nixpkgs: b61d084 -> 07ca7b6lassulus2017-10-031-1/+1
| |
| * l prism.r: track nginx changeslassulus2017-10-021-1/+6
| |
| * l wine: pkgs.wineFull -> pkgs.winelassulus2017-10-021-1/+1
| |
| * l ejabberd: RIPlassulus2017-10-022-31/+0
| |
| * l nixpkgs: 670b4e2 -> b61d084lassulus2017-10-021-1/+1
| |
| * krebs.tinc: import types explicitlylassulus2017-10-021-0/+1
| |
| * Revert "l nixpkgs: 670b4e2 -> 5ac8389"lassulus2017-10-021-1/+1
| | | | | | | | This reverts commit f1908e0fa546bde76a95d3da20521d6170cd08f8.
| * 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
| | |\
| | * | 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
| | | |
| * | | gitlab-runner: configText -> configFilelassulus2017-09-191-14/+13
| | | |
| * | | nixpkgs 8ed299f -> 670b4e2 (17.09)lassulus2017-09-191-1/+1
| | | |
| * | | l bepasty: forceSSL conflicts with enableSSLlassulus2017-09-191-1/+0
| | | |
| * | | bepasty: pythonPackages.bepasty-server -> bepastylassulus2017-09-191-1/+1
| | | |
| * | | requests2 -> requstslassulus2017-09-198-8/+8
| | | |
| * | | l nixpkgs: d151161 -> 670b4e2 (17.09)lassulus2017-09-191-7/+2
| | | |
* | | | tv gitrepos: #krebs -> #xxxtv2017-10-011-1/+1
| |_|/ |/| |
* | | #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
| |/ |/|
* | 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
|\ \