summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge remote-tracking branch 'onondaga/master'lassulus2018-02-274-15/+25
| | |\| | | |
| | | * | | | nin git: remove irc announcenin2018-02-271-11/+0
| | | * | | | nin: follow krebs nixpkgsnin2018-02-271-4/+1
| | | * | | | Merge remote-tracking branch 'prism/master'nin2018-02-2745-195/+672
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of prism:stockholmnin2018-02-1127-323/+497
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'prism/master'nin2018-01-3042-216/+717
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of prism:stockholmnin2018-01-1159-151/+577
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | nin axon: add abletonnin2018-01-032-0/+24
| | | * | | | | | | | Merge branch 'master' of prism:stockholmnin2018-01-032-0/+21
| | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | nixpkgs: d09e425 -> c5bc83blassulus2018-02-271-1/+1
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschlijeschli2018-02-2881-509/+1609
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-277-19/+55
| | |\| | | | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'gum/master'lassulus2018-02-266-14/+42
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | ma git: init hydra-stockholmmakefu2018-02-261-0/+1
| | | | * | | | | | | ma programs-db: ripmakefu2018-02-262-13/+1
| | | | * | | | | | | ma hydra.wbob.r: initmakefu2018-02-263-1/+40
| | | * | | | | | | | l mail: add more mailboxeslassulus2018-02-251-2/+5
| | | * | | | | | | | l mail: use tags for mailboxeslassulus2018-02-251-3/+8
| | * | | | | | | | | 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
| | | |\| | | | | | |