summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'prism/master' (despite bad style)tv2018-05-0977-785/+1404
| |\
| | * l xmonad: change default layout orderlassulus2018-05-081-1/+1
| | * l nichtparasoup: update default feedslassulus2018-05-081-2/+2
| | * l icarus.r: import wine.nixlassulus2018-05-081-0/+5
| | * l websites utils: forceSSLlassulus2018-05-071-13/+3
| | * l baseX: add dconflassulus2018-05-071-0/+1
| | * l prism.r: simplify lol.lassul.us nginxlassulus2018-05-071-4/+1
| | * l icarus.r: add dpass & macchangerlassulus2018-05-071-0/+5
| | * l: add icarus.pgplassulus2018-05-072-0/+52
| | * l nichtparasoup: cf164b5 -> c6dcd0dlassulus2018-05-041-13/+3
| | * l prism.r: enable nichtparasouplassulus2018-05-041-0/+16
| | * l prism.r: add pubkey to downloadlassulus2018-05-041-0/+5
| | * l: add nichtparasoup modulelassulus2018-05-042-0/+49
| | * l: init nichtparasouplassulus2018-05-042-0/+38
| | * l mors: open chromecast portslassulus2018-05-041-1/+3
| | * l: add lol.lassul.uslassulus2018-05-041-0/+1
| | * Merge remote-tracking branch 'ni/master'lassulus2018-05-043-8/+8
| | |\
| | * | j zsh: pin LS_COLORS revlassulus2018-05-041-2/+2
| | * | j: changed cert hashesjeschli2018-05-041-7/+9
| | * | Merge remote-tracking branch 'origin/master'jeschli2018-05-0488-972/+1257
| | |\ \
| | | * | all hope is lost. RIPlassulus2018-05-033-76/+0
| | * | | j conflicts resolve. dirty commitjeschli2018-05-044-15/+18
| * | | | tv nixpkgs: 53e6d67 -> 7cbf6catv2018-05-081-2/+1
| | |_|/ | |/| |
| * | | kops 1.1.0 -> krops 1.0.0tv2018-05-032-7/+7
| * | | tv gitrepos: kops -> kropstv2018-05-031-1/+1
* | | | ma hw/irtoy: initmakefu2018-05-311-0/+15
* | | | ma source: bump nixpkgs to todaymakefu2018-05-311-1/+1
* | | | ma omo.r: also deploy torrent secretsmakefu2018-05-311-0/+1
* | | | ma bluetooth: separate filemakefu2018-05-313-40/+46
| |_|/ |/| |
* | | Merge remote-tracking branch 'gum/master'lassulus2018-05-0310-32/+97
|\ \ \
| * | | ma omo.r: re-enable torrentmakefu2018-05-031-2/+3
| * | | ma wbob.r: allow port 3000makefu2018-05-031-1/+2
| * | | ma gum: deploy kexecmakefu2018-05-031-0/+1
| * | | Merge remote-tracking branch 'lass/master'makefu2018-05-0343-600/+410
| |\ \ \
| * | | | k worlddomination: deploy africamakefu2018-05-031-0/+13
| * | | | ma onebutton.r: remove noXlibsmakefu2018-05-031-9/+13
| * | | | ma network-manager: wanted by multi-usermakefu2018-05-031-2/+1
| * | | | ma core-gui: rip flash on firefoxmakefu2018-05-031-4/+0
| * | | | Merge branch 'master' of prism:stockholmmakefu2018-04-2629-208/+1170
| |\ \ \ \
| * | | | | ma gum.r: expose euer.monmakefu2018-04-252-0/+27
| * | | | | ma source: use .passmakefu2018-04-211-14/+37
* | | | | | l repo-sync: RIP web-routes-wai-customlassulus2018-05-031-1/+0
* | | | | | l prism.r: add restic backupslassulus2018-05-031-0/+25
| |_|/ / / |/| | | |
* | | | | l monitoring: use correct logstash urllassulus2018-05-031-1/+1
* | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-05-033-15/+22
|\ \ \ \ \
| * | | | | j: experimental bln focused rombus setupjeschli2018-04-243-15/+22
| | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-04-183-0/+329
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-04-1814-13/+585
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-04-1855-2181/+1672
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge remote-tracking branch 'onondaga/master'lassulus2018-05-031-0/+1
|\ \ \ \ \ \ \ \