summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2019-08-067-4/+54
|\
| * external: public ips for rose/martha/donnaJörg Thalheim2019-07-181-0/+15
| * l xerxes.r: add the_playlist synclassulus2019-07-151-0/+15
| * blessings/email-header: add 19.09 compatlassulus2019-07-152-0/+9
| * l blue.r: fix source.nixlassulus2019-07-151-3/+3
| * syncthing: run preStart as root on 19.09lassulus2019-07-151-0/+1
| * l: add domsen-backup hostlassulus2019-07-151-0/+9
| * bier bal: prefix nicks with the_lassulus2019-07-151-1/+2
* | Merge branch 'master' of prism.r:stockholmjeschli2019-07-1622-7/+1493
|\|
| * l xerxes.r: revive morelassulus2019-07-147-16/+159
| * Merge remote-tracking branch 'mb/master'lassulus2019-07-1413-2/+1176
| |\
| | * mb p1nk.r: add pekwmmagenbluten2019-07-141-1/+2
| | * mb: add rofl.rmagenbluten2019-07-145-0/+404
| | * mb gr33n.r: add codimdmagenbluten2019-07-142-0/+17
| | * mb: add neovim configmagenbluten2019-07-144-2/+518
| | * mb: update host configsmagenbluten2019-07-144-0/+4
| | * mb suns1n3.r: add configs; update usersmb2019-07-143-0/+232
| * | Revert "l: rip xerxes"lassulus2019-07-113-0/+85
| |/
| * external: add rose,martha,donna (Mic92)lassulus2019-07-091-0/+84
| * nixpkgs: d77e3bd -> 754763flassulus2019-07-061-3/+3
* | j bolide: add nygma toolchainjeschli2019-06-301-1/+3
* | j bolide: remove home-managerjeschli2019-06-302-190/+3
* | j bolide: enable broadcom drivers for wifijeschli2019-06-301-0/+1
* | j brauerei: add aspell, ispell for spacemacsjeschli2019-06-301-0/+2
* | j brauerei: add c++ toolchain for nygmajeschli2019-06-301-1/+3
* | j brauerei: add unstable as sourcejeschli2019-06-301-0/+1
* | j krops: add unstable channeljeschli2019-06-301-0/+4
* | Merge branch 'master' of prism.r:stockholmjeschli2019-06-2569-628/+1179
|\|
| * external: Add piename2019-06-251-0/+26
| * external: Added user ilmu, and email.zx9w2019-06-251-0/+3
| * external: Put Matchbox and Inspector in alphabetic orderzx9w2019-06-251-53/+53
| * uppreisn fixuplassulus2019-06-251-1/+1
| * external: Added uppreisn to the VPN (Ilmu)zx9w2019-06-251-0/+25
| * Merge remote-tracking branch 'prism/master'tv2019-06-2543-164/+833
| |\
| | * krops: 1.11.1 -> 1.14.0tv2019-06-191-0/+0
| | * nixpkgs: f01ed7b -> d77e3bdlassulus2019-06-191-3/+3
| | * nixpkgs: 1601f55 -> f01ed7blassulus2019-06-191-3/+3
| | * external: add wilde.r (kmein)lassulus2019-06-151-0/+25
| | * nixpkgs: e2883c3 -> 1601f55lassulus2019-06-151-3/+3
| | * Merge remote-tracking branch 'gum/master'lassulus2019-06-151-2/+6
| | |\
| | | * ma wiregrill: ipv4 for wiregrillmakefu2019-06-151-2/+6
| | * | Merge remote-tracking branch 'gum/master'lassulus2019-06-151-7/+15
| | |\|
| | | * ma: add rockit, wiregrill for gummakefu2019-06-151-7/+15
| | * | Merge remote-tracking branch 'gum/master'lassulus2019-06-158-64/+91
| | |\|
| | | * shack/gitlab-runner: remove trailing whitespacemakefu2019-06-141-1/+1
| | | * ma wiregrill: update gum, add rockitmakefu2019-06-142-1/+2
| | | * Merge remote-tracking branch 'lass/master'makefu2019-06-1444-485/+950
| | | |\
| | | * | wolf secrets: add shackspace-gitlab-cimakefu2019-06-131-0/+0
| | | * | external: add 0x4a6fmakefu2019-06-132-0/+5
| | | * | wolf.r: add netbox docker-composemakefu2019-06-132-0/+41