summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism:stockholmmakefu2018-06-2433-343/+74
|\
| * l blue-host: don't restart container on changelassulus2018-06-221-0/+1
| * l prism.r: enable murmurlassulus2018-06-221-0/+8
| * l cabal.r: remove unneeded stufflassulus2018-06-221-5/+0
| * l baseX: add nix-indexlassulus2018-06-201-0/+1
| * l: add radio.lassul.uslassulus2018-06-202-0/+13
| * buildbot: also fetch submoduleslassulus2018-06-201-0/+1
| * nix-writers: init submoduletv2018-06-1926-336/+37
| * Merge remote-tracking branch 'onondaga-http/master'lassulus2018-06-141-2/+13
| |\
| | * nin axon: add login manager & some programsnin2018-06-141-2/+13
* | | ma source: cherry-pick forecastio and uhub/sqlitemakefu2018-06-241-1/+3
* | | onebutton.r: add mpc-bootermakefu2018-06-242-1/+31
* | | nextgum.r: initmakefu2018-06-241-0/+32
* | | ma gum.r: split sw/hw configmakefu2018-06-172-36/+58
|/ /
* | ma wbob.r: disable hydra (for now)makefu2018-06-141-1/+1
* | Merge remote-tracking branch 'lass/master'makefu2018-06-1436-313/+287
|\|
| * Merge remote-tracking branch 'gum/master'lassulus2018-06-139-51/+77
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2018-06-136-27/+19
| |\ \
| | * | tv gitrepos: add nix-writerstv2018-06-121-0/+1
| | * | tv kaepsele: RIPtv2018-05-311-24/+0
| | * | ejabberd: use utillinux's flocktv2018-05-251-2/+1
| | * | tv urlwatch nixos: 17.09 -> 18.03tv2018-05-121-1/+1
| | * | tv xmonad: add otpmenutv2018-05-091-0/+1
| | * | tv otpmenu: inittv2018-05-091-0/+15
| * | | github krebscode -> krebslassulus2018-06-129-13/+13
| * | | Revert "l prism.r: remove unnecessary iptables forward"lassulus2018-06-111-0/+15
| * | | l: remove xerxes from authorizedKeyslassulus2018-06-081-1/+0
| * | | l baseX: add ag to pkgslassulus2018-06-081-0/+1
| * | | l prism.r: open ports for moshlassulus2018-06-081-0/+5
| * | | l websites domsen: serve www.freemonkey.artlassulus2018-06-081-1/+4
| * | | l git: fix typolassulus2018-06-081-1/+1
| * | | l blue: add ag & nmap to pkgslassulus2018-06-081-0/+5
| * | | l prism.r: remove unnecessary iptables forwardlassulus2018-06-081-15/+0
| * | | move Reaktor|krebs from prism to hotdoglassulus2018-06-082-1/+1
| * | | reaktor: add agenda todo pluginlassulus2018-06-082-2/+6
| * | | Reaktor plugins: add todo plugin generatorlassulus2018-06-081-0/+22
| * | | Reaktor plugins: remove wiki-todolassulus2018-06-082-27/+0
| * | | l: kops -> kropslassulus2018-06-073-13/+20
| * | | ci: build steps dynamically, cleanuplassulus2018-06-056-216/+179
| * | | nixpkgs: ef74caf -> 7295e17lassulus2018-06-041-1/+1
| * | | kops -> kropslassulus2018-06-042-10/+9
| * | | add lass-mors to authorizedKeyslassulus2018-06-041-0/+1
* | | | ma pkgs.python-firetv: no need for nixpkgs-unstable anymoremakefu2018-06-101-1/+1
| |_|/ |/| |
* | | ma tools: core -> desktopmakefu2018-06-073-9/+12
* | | ma source: fix exfat-nofuse buildmakefu2018-05-311-2/+3
* | | Merge remote-tracking branch 'lass/master'makefu2018-05-31114-650/+993
|\| |
| * | l prism.r: add wireguard configlassulus2018-05-211-0/+28
| * | l: remove IM.nixlassulus2018-05-212-74/+0
| * | l: add bitlbee.nixlassulus2018-05-211-0/+15
| * | l red: forceSSLlassulus2018-05-211-1/+1