summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-2515-14/+150
|\
| * l: init dpdkmlassulus2018-02-241-0/+26
| * nixpkgs: c831224 -> d09e425lassulus2018-02-221-1/+1
| * Merge remote-tracking branch 'prism/makefu'lassulus2018-02-223-1/+40
| |\
| | * ma 6tests/secrets: add auth.nix dummymakefu2018-02-221-0/+1
| | * ma x.r: add bluetoothmakefu2018-02-211-0/+36
| | * ma urlwatch: taskwarrior is now on githubmakefu2018-02-191-1/+3
| * | l baseX: run xmonad only in xmonad sessionlassulus2018-02-221-1/+2
| * | l baseX: use network-managerlassulus2018-02-222-0/+25
| * | Merge remote-tracking branch 'prism/tv'lassulus2018-02-191-1/+5
| |\ \
| | * | github: update known hoststv2018-02-191-1/+5
| * | | l: php5 -> php7lassulus2018-02-191-1/+0
| * | | l vim: run gometalinterlassulus2018-02-191-0/+3
| * | | l vim: add govet workaroundlassulus2018-02-191-0/+3
| * | | l minecraft: open port for dynmaplassulus2018-02-191-0/+1
| * | | l shodan.r: ignore lidswitchlassulus2018-02-191-0/+4
| * | | l prism.r: add jeschli userlassulus2018-02-191-0/+10
| * | | l helios.r: add minio.certlassulus2018-02-191-8/+29
| * | | l icarus.r: update ssh pubkeylassulus2018-02-191-1/+1
* | | | Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-1844-369/+686
|\| | |
| * | | Merge remote-tracking branch 'ni/master'lassulus2018-02-162-69/+0
| |\| |
| | * | exim: RIPtv2018-02-151-64/+0
| | * | tv gitrepos: drop redundant fetch permissionstv2018-02-141-5/+0
| * | | Merge remote-tracking branch 'gum/master'lassulus2018-02-165-56/+68
| |\ \ \ | | | |/ | | |/|
| | * | ma sdev.,vbob.r: allow unfreemakefu2018-02-162-0/+6
| | * | ma x.r: vbox+extensionpack does not buildmakefu2018-02-161-1/+1
| | * | ma vbox-guest: remove from vhosts, prepare for working upstreammakefu2018-02-163-4/+4
| | * | ma x.r: init wireguard, disable wifi, enable pcmanfmmakefu2018-02-151-1/+33
| | * | ma docker: use 2configsmakefu2018-02-143-5/+2
| | * | ma vbox-guest: initmakefu2018-02-143-49/+26
| * | | l wine: remove wine64lassulus2018-02-151-15/+0
| * | | Merge remote-tracking branch 'gum/master'lassulus2018-02-158-10/+32
| |\| |
| | * | ma sdev.r: force virtualisation.virtualbox.guest.enable = falsemakefu2018-02-141-1/+2
| | * | ma default: fix typomakefu2018-02-141-1/+1
| | * | ma source: cd36b3d -> 51810e0makefu2018-02-141-1/+2
| | * | ma tools/studio: remove latency_msecmakefu2018-02-141-2/+2
| | * | ma tools/mobility: re-introduce working exfat-nofusemakefu2018-02-141-1/+1
| | * | ma omo.r: add cryptDisk3makefu2018-02-141-3/+8
| | * | ma gum.r: add workrmakefu2018-02-141-0/+5
| | * | ma: add makefu-remote-buildermakefu2018-02-141-0/+4
| | * | ma {vbob,sdev}.r: disable vbox guest extensions for nowmakefu2018-02-142-3/+9
| | |/
| * / nixpkgs: 2062ac5 -> c831224lassulus2018-02-151-1/+1
| |/
| * l add daedalus.rsalassulus2018-02-131-0/+1
| * l xmonad: add floatHook typelassulus2018-02-131-1/+3
| * l xmonad: send urgency to dbuslassulus2018-02-131-2/+13
| * l xserver: add DBUS_SESSIONlassulus2018-02-131-0/+6
| * l zsh: check forlassulus2018-02-131-1/+1
| * l zsh: add LS_COLORS in zsh menulassulus2018-02-131-3/+2
| * l logf: add urgency for lass@morslassulus2018-02-131-0/+4
| * l exim-smarthost: add even more mailslassulus2018-02-131-0/+11