summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "krebs git: refactor"lassulus2018-08-041-24/+36
* nixpkgs: d6c6c7f -> d0c868elassulus2018-08-041-1/+1
* Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-08-044-37/+32
|\
| * Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-08-014-50/+32
| |\
| | * krebs git: refactorjeschli2018-08-011-36/+24
| | * j emacs: activate evilModejeschli2018-08-011-0/+1
| * | j xserver: removed dpi; modified urxvt font-sizejeschli2018-08-011-2/+2
| * | j bln: +pair programming eth linkjeschli2018-08-011-0/+5
* | | news: kill some broken feedslassulus2018-08-041-4/+0
* | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-316-21/+44
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-313-6/+37
| |\|
| | * j: +officevpn by luisjeschli2018-07-311-0/+19
| | * Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-3120-52/+101
| | |\
| | * | j my-emacs: cooler feel for org-modejeschli2018-07-311-6/+14
| | * | j bln: new office vpnjeschli2018-07-311-0/+4
| | * | Merge remote-tracking branch 'origin/master'jeschli2018-07-093-10/+18
| | |\ \
| * | | | j xserver: remove xft.dpi optionjeschli2018-07-311-1/+0
| * | | | j brauerei: enable pulseaudiojeschli2018-07-311-0/+1
| * | | | j brauerei: add audio group for jeschlijeschli2018-07-311-1/+1
| * | | | j brauerei: *dpijeschli2018-07-311-1/+1
| * | | | j brauerei: +taskwarriorjeschli2018-07-311-0/+1
| * | | | j brauerei: reformattingjeschli2018-07-311-0/+1
| * | | | j brauerei: remove some comment garbagejeschli2018-07-311-12/+2
| | |_|/ | |/| |
* | | | l browsers: add krebsgoldlassulus2018-07-301-0/+1
* | | | Merge remote-tracking branch 'prism/makefu'lassulus2018-07-285-9/+34
|\ \ \ \
| * | | | ma owncloud: enable owncloud cron servicemakefu2018-07-261-0/+8
| * | | | ma stats/client: disable tracefsmakefu2018-07-261-0/+1
| * | | | ma owncloud: add required zend_extension to enable opcachemakefu2018-07-261-1/+1
| * | | | Merge branch 'master' of prism:stockholmmakefu2018-07-2022-53/+145
| |\ \ \ \
| * | | | | ma wbob.r: use mceusbmakefu2018-07-182-3/+22
| * | | | | onebutton.r: use the latest unstable tarball as sourcemakefu2018-07-181-5/+2
* | | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-281-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | reaktor: task-remove -> task-deletejeschli2018-07-221-1/+1
| | |/ / / | |/| | |
* | | | | l xmonad: add knav bindinglassulus2018-07-281-0/+2
* | | | | l blue: add git-previewlassulus2018-07-281-0/+1
* | | | | l helios.r: remove dockerlassulus2018-07-282-3/+2
* | | | | l: add knavlassulus2018-07-281-0/+26
* | | | | l: add hackbeach@lassul.uslassulus2018-07-282-6/+5
* | | | | nixpkgs: 56fad14 -> d6c6c7flassulus2018-07-251-1/+1
|/ / / /
* | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-196-8/+11
|\ \ \ \
| * | | | j: remove trailing whitespacesjeschli2018-07-175-8/+8
| * | | | Merge remote-tracking branch 'origin/master'jeschli2018-07-1712-36/+76
| |\ \ \ \
| * | | | | reaktor-retiolum: +task-(add,delete,list)jeschli2018-07-171-0/+3
* | | | | | Merge remote-tracking branch 'prism/master'tv2018-07-1755-172/+1028
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | l git: add disko repolassulus2018-07-132-0/+5
| * | | | | l domsen: add bui userlassulus2018-07-131-0/+8
| * | | | | l dcso-dev: add lass-mors to authorizedKeyslassulus2018-07-131-0/+1
| * | | | | l mors.r: set public_html as default pagelassulus2018-07-131-0/+1
| * | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-102-11/+25
| |\| | | |
| | * | | | Reaktor: +plugins: task-{add, delete, list} -taskwarriorjeschli2018-07-101-1/+3