summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* j bln: +virtualboxMarkus Hihn2018-01-192-0/+24
|
* Merge branch 'master' of prism.r:stockholmMarkus Hihn2018-01-174-39/+5
|\
| * Merge remote-tracking branch 'ni/master'lassulus2018-01-162-36/+2
| |\
| | * tv ju: RIPtv2018-01-161-34/+0
| | |
| | * Merge remote-tracking branch 'prism/master'tv2018-01-1626-63/+339
| | |\
| | * | tv vim: mkdirs -> need-dirstv2018-01-161-2/+2
| | | |
| * | | reaktor-plugins url-title: don't strip youtubelassulus2018-01-161-1/+1
| | | |
| * | | l git: don't show verbose git loglassulus2018-01-161-2/+2
| | |/ | |/|
* | | Merge branch 'master' of prism.r:stockholmMarkus Hihn2018-01-1611-35/+91
|\| |
| * | l nixpkgs: d202e30 -> 92d088elassulus2018-01-161-1/+1
| | |
| * | l zsh: cleanuplassulus2018-01-161-16/+18
| | |
| * | l: add more emailslassulus2018-01-161-0/+5
| | |
| * | l: add zshlassulus2018-01-161-5/+6
| | |
| * | l browsers: add finlassulus2018-01-161-3/+4
| | |
| * | l browsers: preconfigure chromiumlassulus2018-01-161-0/+8
| | |
| * | l browsers: use precedencelassulus2018-01-161-1/+4
| | |
| * | l: add taskwarrior to pkgslassulus2018-01-161-0/+2
| | |
| * | l prism.r: add downloading (again)lassulus2018-01-161-0/+1
| | |
| * | l prism.r: allow jeschli push to all brancheslassulus2018-01-161-1/+1
| | |
| * | l: add minecraft.nixlassulus2018-01-162-7/+22
| | |
| * | l daedalus.r: install some softwarelassulus2018-01-161-0/+3
| | |
| * | l: add lassul.us dnslassulus2018-01-161-0/+15
| | |
| * | repo-sync: don't announce syncs in irclassulus2018-01-111-1/+1
| | |
* | | jeschli: +irc aliasjeschli2018-01-121-0/+3
| | |
* | | jeschli enklave: import IMwjeschli2018-01-121-0/+1
|/ /
* | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-109-3/+118
|\ \
| * | jeschli retiolum: connect to enklavejeschli2018-01-101-0/+4
| | |
| * | jeschli: +enklave.rjeschli2018-01-104-0/+110
| | |
| * | jeschli: set default hostnamejeschli2018-01-103-2/+2
| | |
| * | Merge branch 'master' of prism.r:stockholmjeschli2018-01-091-1/+1
| |\ \
| * | | jeschli: meltdown fixMarkus Hihn2018-01-092-1/+2
| | | |
* | | | Merge remote-tracking branch 'gum/master'lassulus2018-01-105-2/+66
|\ \ \ \
| * | | | ma photostore.krebsco.de: init on gum.rmakefu2018-01-104-1/+65
| | | | | | | | | | | | | | | | | | | | also init the application server and config
| * | | | Merge branch 'master' of http://cgit.ni/stockholmmakefu2018-01-098-14/+17
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of prism:stockholmmakefu2018-01-092-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | pkgs.internetarchive: remove fetchPypi, coming from python3Packagesmakefu2018-01-081-1/+1
| | | | |
* | | | | infest prepare: no subshell for _prepare*prism/staging/jeschli-hetznerjeschli2018-01-091-4/+4
| | | | |
* | | | | infest prepare: remove duplicated codejeschli2018-01-091-5/+0
| | | | |
* | | | | infest prepare: add _whichjeschli2018-01-091-2/+8
| | | | |
* | | | | infest prepare: add hetzner_rescue supportprism/staging/hetznerlassulus2018-01-091-21/+61
| |_|/ / |/| | |
* | | | makefu collected-base: .retiolum -> .rtv2018-01-091-2/+2
| | | |
* | | | makefu bepasty-dual: .retiolum -> .rtv2018-01-091-1/+4
| | | |
* | | | lass bepasty: .retiolum -> .rtv2018-01-091-1/+4
| | | |
* | | | makefu euer.wiki: .retiolum -> .rtv2018-01-091-1/+1
| | | |
* | | | ircd: .retiolum -> .rtv2018-01-091-2/+2
| | | |
* | | | nin: .retiolum -> .rtv2018-01-091-6/+2
| | | |
* | | | Merge remote-tracking branch 'prism/master'tv2018-01-0939-71/+466
|\ \ \ \ | | |/ / | |/| |
| * | | l nixpkgs: 0653b73 -> d202e30lassulus2018-01-091-1/+1
| | |/ | |/|
| * | l nixpkgs: 0b30c1d -> 0653b73lassulus2018-01-091-1/+1
| | |
| * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-071-1/+1
| |\ \ | | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 15:17:54 +0000