summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* j brauerei: +vagrantjeschli2018-06-191-0/+1
* Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-06-19199-1882/+2651
|\
| * Merge remote-tracking branch 'origin/master'jeschli2018-06-19140-926/+1349
| |\
| | * Merge remote-tracking branch 'onondaga-http/master'lassulus2018-06-141-2/+13
| | |\
| | | * nin axon: add login manager & some programsnin2018-06-141-2/+13
| | * | 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
| | | * | l git: add blue & mors to allowed userslassulus2018-05-201-1/+1
| | | * | l monitoring: don't send resolved statuslassulus2018-05-201-1/+0
| | | * | l exim: add new mail addresseslassulus2018-05-201-0/+2
| | | * | l backup: add blue to authorizedKeyslassulus2018-05-201-0/+1
| | | * | l exim: allow sending from blue.rlassulus2018-05-201-1/+1
| | | * | l: lass is now lass@blue.rlassulus2018-05-201-1/+1
| | | * | l blue.r: add weechat, backups & maillassulus2018-05-202-0/+85
| | | * | l prism.r: forward weechat port to blue.rlassulus2018-05-201-0/+15
| | | * | l mors.r: use correct wifi maclassulus2018-05-201-1/+1