summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-09-05 12:17:59 +0200
committerlassulus <lass@aidsballs.de>2015-09-05 12:17:59 +0200
commitf54a0a9ea7fd5a9902a5b38786da42f06d615b5a (patch)
treed7c475b212d8acc35a5dc7d20ec1f2228c664010
parentf3c1727659c59ff638b1adead8e30ee2f79f39de (diff)
parentd6d9956abc60548c755d30e6a5bd13c10abbb181 (diff)
Merge branch 'makefu'
-rw-r--r--default.nix6
-rw-r--r--krebs/3modules/Reaktor.nix132
-rw-r--r--krebs/3modules/default.nix12
-rw-r--r--krebs/3modules/github-hosts-sync.nix6
-rw-r--r--krebs/3modules/retiolum.nix2
-rw-r--r--krebs/3modules/urlwatch.nix2
-rw-r--r--krebs/4lib/default.nix7
-rw-r--r--krebs/4lib/shell.nix22
-rw-r--r--krebs/5pkgs/Reaktor/default.nix19
-rw-r--r--krebs/5pkgs/cac/default.nix (renamed from krebs/5pkgs/cac.nix)0
-rw-r--r--krebs/5pkgs/charybdis/default.nix (renamed from tv/5pkgs/charybdis/default.nix)0
-rw-r--r--krebs/5pkgs/charybdis/remove-setenv.patch (renamed from tv/5pkgs/charybdis/remove-setenv.patch)0
-rw-r--r--krebs/5pkgs/default.nix60
-rw-r--r--krebs/5pkgs/dic/default.nix (renamed from krebs/5pkgs/dic.nix)0
-rw-r--r--krebs/5pkgs/genid/default.nix (renamed from krebs/5pkgs/genid.nix)0
-rw-r--r--krebs/5pkgs/github-hosts-sync/default.nix (renamed from krebs/5pkgs/github-hosts-sync.nix)0
-rw-r--r--krebs/5pkgs/github-known_hosts/default.nix (renamed from krebs/5pkgs/github-known_hosts.nix)2
-rw-r--r--krebs/5pkgs/github-known_hosts/github.ssh.pub (renamed from Zpubkeys/github.ssh.pub)0
-rw-r--r--krebs/5pkgs/hashPassword/default.nix (renamed from krebs/5pkgs/hashPassword.nix)0
-rw-r--r--krebs/5pkgs/krebszones/default.nix20
-rw-r--r--krebs/5pkgs/lentil/default.nix (renamed from tv/5pkgs/lentil/default.nix)0
-rw-r--r--krebs/5pkgs/lentil/syntaxes.patch (renamed from tv/5pkgs/lentil/syntaxes.patch)0
-rw-r--r--krebs/5pkgs/much/default.nix (renamed from tv/5pkgs/much.nix)0
-rw-r--r--krebs/5pkgs/nq/default.nix (renamed from krebs/5pkgs/nq.nix)0
-rw-r--r--krebs/5pkgs/posix-array/default.nix (renamed from krebs/5pkgs/posix-array.nix)0
-rw-r--r--krebs/5pkgs/pssh/default.nix37
-rw-r--r--krebs/5pkgs/youtube-tools/default.nix (renamed from krebs/5pkgs/youtube-tools.nix)0
-rw-r--r--krebs/Zhosts/Styx (renamed from Zhosts/Styx)0
-rw-r--r--krebs/Zhosts/ThinkArmageddon (renamed from Zhosts/ThinkArmageddon)0
-rw-r--r--krebs/Zhosts/TriBot (renamed from Zhosts/TriBot)0
-rw-r--r--krebs/Zhosts/ach (renamed from Zhosts/ach)0
-rw-r--r--krebs/Zhosts/air (renamed from Zhosts/air)0
-rw-r--r--krebs/Zhosts/alarmpi (renamed from Zhosts/alarmpi)0
-rw-r--r--krebs/Zhosts/albi10 (renamed from Zhosts/albi10)0
-rw-r--r--krebs/Zhosts/albi7 (renamed from Zhosts/albi7)0
-rw-r--r--krebs/Zhosts/almoehi (renamed from Zhosts/almoehi)0
-rw-r--r--krebs/Zhosts/alphalabs (renamed from Zhosts/alphalabs)0
-rw-r--r--krebs/Zhosts/apfull (renamed from Zhosts/apfull)0
-rw-r--r--krebs/Zhosts/bitchctl (renamed from Zhosts/bitchctl)0
-rw-r--r--krebs/Zhosts/bitchextend (renamed from Zhosts/bitchextend)0
-rw-r--r--krebs/Zhosts/bitchtop (renamed from Zhosts/bitchtop)0
-rw-r--r--krebs/Zhosts/box (renamed from Zhosts/box)0
-rw-r--r--krebs/Zhosts/bridge (renamed from Zhosts/bridge)0
-rw-r--r--krebs/Zhosts/c2ft (renamed from Zhosts/c2ft)0
-rw-r--r--krebs/Zhosts/c2fthome (renamed from Zhosts/c2fthome)0
-rw-r--r--krebs/Zhosts/casino (renamed from Zhosts/casino)0
-rw-r--r--krebs/Zhosts/cat1 (renamed from Zhosts/cat1)0
-rw-r--r--krebs/Zhosts/cband (renamed from Zhosts/cband)0
-rw-r--r--krebs/Zhosts/cd (renamed from Zhosts/cd)0
-rw-r--r--krebs/Zhosts/cloudkrebs (renamed from Zhosts/cloudkrebs)0
-rw-r--r--krebs/Zhosts/darth (renamed from Zhosts/darth)0
-rw-r--r--krebs/Zhosts/dei (renamed from Zhosts/dei)0
-rw-r--r--krebs/Zhosts/destroy (renamed from Zhosts/destroy)0
-rw-r--r--krebs/Zhosts/devstar (renamed from Zhosts/devstar)0
-rw-r--r--krebs/Zhosts/eigenserv (renamed from Zhosts/eigenserv)0
-rw-r--r--krebs/Zhosts/elvis (renamed from Zhosts/elvis)0
-rw-r--r--krebs/Zhosts/eulerwalk (renamed from Zhosts/eulerwalk)0
-rw-r--r--krebs/Zhosts/exile (renamed from Zhosts/exile)0
-rw-r--r--krebs/Zhosts/exitium_mobilis (renamed from Zhosts/exitium_mobilis)0
-rw-r--r--krebs/Zhosts/falk (renamed from Zhosts/falk)0
-rw-r--r--krebs/Zhosts/fastpoke (renamed from Zhosts/fastpoke)0
-rw-r--r--krebs/Zhosts/filebitch (renamed from Zhosts/filebitch)0
-rw-r--r--krebs/Zhosts/filepimp (renamed from Zhosts/filepimp)0
-rw-r--r--krebs/Zhosts/flap (renamed from Zhosts/flap)0
-rw-r--r--krebs/Zhosts/foobar (renamed from Zhosts/foobar)0
-rw-r--r--krebs/Zhosts/fuerkrebs (renamed from Zhosts/fuerkrebs)0
-rw-r--r--krebs/Zhosts/go (renamed from Zhosts/go)0
-rw-r--r--krebs/Zhosts/gum (renamed from Zhosts/gum)0
-rw-r--r--krebs/Zhosts/heidi (renamed from Zhosts/heidi)0
-rw-r--r--krebs/Zhosts/horisa (renamed from Zhosts/horisa)0
-rw-r--r--krebs/Zhosts/horreum_magnus (renamed from Zhosts/horreum_magnus)0
-rw-r--r--krebs/Zhosts/incept (renamed from Zhosts/incept)0
-rw-r--r--krebs/Zhosts/ire (renamed from Zhosts/ire)0
-rw-r--r--krebs/Zhosts/ire2 (renamed from Zhosts/ire2)0
-rw-r--r--krebs/Zhosts/irkel (renamed from Zhosts/irkel)0
-rw-r--r--krebs/Zhosts/juhulian (renamed from Zhosts/juhulian)0
-rw-r--r--krebs/Zhosts/k2 (renamed from Zhosts/k2)0
-rw-r--r--krebs/Zhosts/kabinett (renamed from Zhosts/kabinett)0
-rw-r--r--krebs/Zhosts/kaepsele (renamed from Zhosts/kaepsele)0
-rw-r--r--krebs/Zhosts/kalle (renamed from Zhosts/kalle)0
-rw-r--r--krebs/Zhosts/karthus (renamed from Zhosts/karthus)0
-rw-r--r--krebs/Zhosts/khackplug (renamed from Zhosts/khackplug)0
-rw-r--r--krebs/Zhosts/kheurop (renamed from Zhosts/kheurop)0
-rw-r--r--krebs/Zhosts/kiosk (renamed from Zhosts/kiosk)0
-rw-r--r--krebs/Zhosts/krebsplug (renamed from Zhosts/krebsplug)0
-rw-r--r--krebs/Zhosts/kvasir (renamed from Zhosts/kvasir)0
-rw-r--r--krebs/Zhosts/laqueus (renamed from Zhosts/laqueus)0
-rw-r--r--krebs/Zhosts/linuxatom (renamed from Zhosts/linuxatom)0
-rw-r--r--krebs/Zhosts/luminos (renamed from Zhosts/luminos)0
-rw-r--r--krebs/Zhosts/machine (renamed from Zhosts/machine)0
-rw-r--r--krebs/Zhosts/makalu (renamed from Zhosts/makalu)0
-rw-r--r--krebs/Zhosts/mako (renamed from Zhosts/mako)0
-rw-r--r--krebs/Zhosts/miefda0 (renamed from Zhosts/miefda0)0
-rw-r--r--krebs/Zhosts/minikrebs (renamed from Zhosts/minikrebs)0
-rw-r--r--krebs/Zhosts/mkdir (renamed from Zhosts/mkdir)0
-rw-r--r--krebs/Zhosts/monitor (renamed from Zhosts/monitor)0
-rw-r--r--krebs/Zhosts/mors (renamed from Zhosts/mors)0
-rw-r--r--krebs/Zhosts/motor (renamed from Zhosts/motor)0
-rw-r--r--krebs/Zhosts/mu (renamed from Zhosts/mu)0
-rw-r--r--krebs/Zhosts/muhbaasu (renamed from Zhosts/muhbaasu)0
-rw-r--r--krebs/Zhosts/nomic (renamed from Zhosts/nomic)0
-rw-r--r--krebs/Zhosts/nomic2 (renamed from Zhosts/nomic2)0
-rw-r--r--krebs/Zhosts/nukular (renamed from Zhosts/nukular)0
-rw-r--r--krebs/Zhosts/omo (renamed from Zhosts/omo)0
-rw-r--r--krebs/Zhosts/pic (renamed from Zhosts/pic)0
-rw-r--r--krebs/Zhosts/pigstarter (renamed from Zhosts/pigstarter)0
-rw-r--r--krebs/Zhosts/pike (renamed from Zhosts/pike)0
-rw-r--r--krebs/Zhosts/pnp (renamed from Zhosts/pnp)0
-rw-r--r--krebs/Zhosts/pornocauster (renamed from Zhosts/pornocauster)0
-rw-r--r--krebs/Zhosts/radiotuxmini (renamed from Zhosts/radiotuxmini)0
-rw-r--r--krebs/Zhosts/random (renamed from Zhosts/random)0
-rw-r--r--krebs/Zhosts/raspafari (renamed from Zhosts/raspafari)0
-rw-r--r--krebs/Zhosts/reimae (renamed from Zhosts/reimae)0
-rw-r--r--krebs/Zhosts/rmdir (renamed from Zhosts/rmdir)0
-rw-r--r--krebs/Zhosts/robchina (renamed from Zhosts/robchina)0
-rw-r--r--krebs/Zhosts/rockit (renamed from Zhosts/rockit)0
-rw-r--r--krebs/Zhosts/rtjure_debian_oder_so (renamed from Zhosts/rtjure_debian_oder_so)0
-rw-r--r--krebs/Zhosts/rtjure_ras (renamed from Zhosts/rtjure_ras)0
-rw-r--r--krebs/Zhosts/rtjure_rdrlab_linkstation (renamed from Zhosts/rtjure_rdrlab_linkstation)0
-rw-r--r--krebs/Zhosts/rubus (renamed from Zhosts/rubus)0
-rw-r--r--krebs/Zhosts/senderechner (renamed from Zhosts/senderechner)0
-rw-r--r--krebs/Zhosts/serenity (renamed from Zhosts/serenity)0
-rw-r--r--krebs/Zhosts/seruundroid (renamed from Zhosts/seruundroid)0
-rw-r--r--krebs/Zhosts/sir_krebs_a_lot (renamed from Zhosts/sir_krebs_a_lot)0
-rw-r--r--krebs/Zhosts/skirfir (renamed from Zhosts/skirfir)0