summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ma pkgs.bento4: init at 1.5.1-624makefu2018-08-302-0/+30
* ma pkgs.cozy-audiobooks: init at 0.6.0makefu2018-08-291-0/+100
* ma 1system: ip4 -> ipv4.addressesmakefu2018-08-295-6/+6
* retiolum-bootstrap: forceSSLmakefu2018-08-291-4/+1
* ma krops.nix: initmakefu2018-08-2926-21/+136
* Merge remote-tracking branch 'lass/master'makefu2018-08-2835-381/+255
|\
| * repo-sync: remove staging branches, stylelassulus2018-08-251-22/+7
| * hotdog.r: repo-sync all the reposlassulus2018-08-242-26/+122
| * l: add some mailslassulus2018-08-231-0/+2
| * l prism.r: add palos pubkeyslassulus2018-08-231-0/+2
| * l daedalus.r: firefox -> chromiumlassulus2018-08-231-1/+2
| * l: update lass-android keyslassulus2018-08-232-2/+2
| * l helios.r: get rid of nearly everythinglassulus2018-08-231-42/+1
| * Merge remote-tracking branch 'prism/master'lassulus2018-08-2312-260/+19
| |\
| | * xmonad-stockholm: 1.1.1 -> 1.2.0lassulus2018-08-141-2/+2
| | * l xmonad: use bitmap fontprism/dcsolassulus2018-08-141-1/+1
| | * l urxvt: use configured font as defaultlassulus2018-08-141-3/+3
| | * xmonad-stockholm: add X11-xft dependencylassulus2018-08-141-2/+2
| | * l baseX: cleanuplassulus2018-08-141-10/+0
| | * l: split print stuff into print.nixlassulus2018-08-143-8/+11
| | * RIP helios.rlassulus2018-08-136-234/+0
| * | automate nixpkgs updatelassulus2018-08-223-1/+17
| * | nixpkgs: d0c868e -> 42c07dlassulus2018-08-111-1/+1
| |/
| * Merge remote-tracking branch 'gum/master'lassulus2018-08-105-58/+175
| |\
| * \ Merge remote-tracking branch 'gum/master'lassulus2018-08-0922-52/+202
| |\ \
| * | | genid_signed -> genid_uint31prism/genidlassulus2018-08-095-13/+13
| * | | 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