summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-031-8/+17
|\
| * j bln: fix xserver servicejeschli2018-06-271-8/+17
| |
* | reaktor-krebs: +taskwarriorjeschli2018-07-031-0/+1
| |
* | Reaktor plugins: +taskwarriorjeschli2018-07-031-0/+7
|/
* j: services.xserver removed from 2configjeschli2018-06-271-20/+0
|
* j vim: +fileline ; cosmeticsjeschli2018-06-271-12/+22
|
* j brauerei: xserverjeschli2018-06-271-21/+16
|
* j brauerei: vagrant fixjeschli2018-06-271-2/+12
|
* 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 programsprism/ninnin2018-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 -> krebsprism/staging/githublassulus2018-06-129-13/+13
| | | | | |
| | | * | | Revert "l prism.r: remove unnecessary iptables forward"lassulus2018-06-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e34ca32676d1fe6a4aab3cca1518b111a36ef8cd.
| | | * | | l: remove xerxes from authorizedKeysprism/staging/blalassulus2018-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 -> kropsprism/staging/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 configprism/blalassulus2018-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
| | | | |