summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism:stockholmnin2018-05-0221-134/+759
|\
| * types host: add monitoring boollassulus2018-04-271-0/+8
| * j 5pkgs: add missing tvs xmonad filesjeschli2018-04-183-0/+329
| * j: xserver, xdg from tv; updated brauereijeschli2018-04-186-0/+275
| * Merge remote-tracking branch 'ni/master'jeschli2018-04-171-26/+0
| |\
| | * font-size: init from tvtv2018-04-171-26/+0
| | * Merge remote-tracking branch 'prism/master'tv2018-04-101-2/+2
| | |\
| | * | pass{,-otp}: init from tvtv2018-04-105-286/+0
| | * | tv: make pass and pass-otp work togethertv2018-04-102-3/+13
| | * | tv pass-otp: init at 1.1.0tv2018-04-101-0/+30
| | * | tv pass: init at 1.7.1tv2018-04-104-0/+246
| * | | j brauerei: first step for tv xmonadjeschli2018-04-172-11/+12
| * | | emacs file sortingjeschli2018-04-171-1/+1
| * | | j brauerei: +hardware.trackpoint configurationjeschli2018-04-171-0/+7
| * | | Merge branch 'master' of prism.r:stockholmjeschli2018-04-105-7/+31
| |\ \ \ | | | |/ | | |/|
| | * | RIP zandronumlassulus2018-04-061-2/+2
| | |/
| | * Merge remote-tracking branch 'ni/nixpkgs-18.03-fix-strip' into staging/18.03lassulus2018-03-274-5/+29
| | |\
| | | * haskellPackages.nix-diff: RIPtv2018-03-271-5/+0
| | | * tv xserver: systemPackages += font-sizetv2018-03-271-0/+1
| | | * tv pkgs: init font-sizetv2018-03-271-0/+26
| | | * tv xmonad: add passmenutv2018-03-261-0/+2
| * | | j brauerei: +rust, +exercism, *minor cosmeticsjeschli2018-04-101-1/+4
| * | | j emacs: cosmetics; +recentFiles modejeschli2018-03-261-15/+11
| * | | j emacs: default-wdith=2jeschli2018-03-261-0/+1
| |/ /
| * | j nixpkgs: follow krebsjeschli2018-03-241-4/+1
| * | j emacs: +go-mode -evil-modejeschli2018-03-241-1/+1
| * | j bolide: +emacsjeschli2018-03-241-0/+1
| * | j emacs: +orgMode +evil-orgjeschli2018-03-221-6/+15
| * | j emacs: cosmeticsjeschli2018-03-211-49/+54
| * | j brauerei: *emacs with magitjeschli2018-03-201-1/+6
| * | j brauerei: +emacsjeschli2018-03-201-0/+1
| * | j bln: hardware-configuration cosmeticsjeschli2018-03-201-3/+0
| * | j: add my-emacsjeschli2018-03-202-0/+59
| * | j bln: -VBOX certsjeschli2018-03-201-2/+0
| * | jeschli bln: config cosmeticsjeschli2018-03-201-55/+20
| * | bln: fix config againjeschli2018-03-201-2/+2
| * | Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschlijeschli2018-03-2019-110/+347
| |\ \
| | * \ Merge remote-tracking branch 'origin/master' into HEADjeschli2018-03-136-56/+86
| | |\ \
| | * \ \ Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschlijeschli2018-02-286-15/+45
| | |\ \ \
| | * \ \ \ Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschlijeschli2018-02-2814-48/+527
| | |\ \ \ \
| | * | | | | j vim: unsure changesjeschli2018-02-281-56/+62
| * | | | | | j: dirty merge againjeschli2018-03-204-73/+38
* | | | | | | nin vim: modify vimrcnin2018-05-021-0/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge remote-tracking branch 'ni/master'lassulus2018-03-061-0/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge remote-tracking branch 'prism/master'tv2018-02-287-15/+47
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
* | / | | | Merge remote-tracking branch 'prism/tv'lassulus2018-03-066-56/+85
|\| | | | | | |/ / / / |/| | | |
| * | | | tv gitrepos: add kopstv2018-02-281-0/+3
| * | | | os-release: use <stockholm-version>tv2018-02-284-0/+24
| * | | | populate: 2.1.0 -> 2.3.0tv2018-02-281-0/+15
| * | | | types: refactor sourcetv2018-02-281-57/+45