summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| * | | Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschlijeschli2018-02-286-15/+45
| |\| |
| | * | Merge remote-tracking branch 'gum/master'lassulus2018-02-281-0/+1
| | |\ \
| | | * | .gitignore: add resultmakefu2018-02-281-0/+1
| | | |/
| | * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-02-281-0/+2
| | |\ \
| | * | | nin im: copy irc script from tvnin2018-02-271-0/+19
| | * | | nin git: remove irc announcenin2018-02-271-11/+0
| | * | | nin: follow krebs nixpkgsnin2018-02-271-4/+1
| | * | | Merge remote-tracking branch 'prism/master'nin2018-02-271-5/+0
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' of prism:stockholmnin2018-02-117-39/+214
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'prism/master'nin2018-01-3011-59/+372
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of prism:stockholmnin2018-01-1116-19/+111
| | |\ \ \ \ \
| | * | | | | | nin axon: add abletonnin2018-01-032-0/+24
| * | | | | | | Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschlijeschli2018-02-2814-48/+527
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-181-5/+0
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | tv gitrepos: drop redundant fetch permissionstv2018-02-141-5/+0
| | | | |_|_|/ | | | |/| | |
| | * / | | | brauerei: +backlightjeschli2018-02-181-0/+2
| | |/ / / /
| | * | | | j vim.nix: remap tt to GoTestjeschli2018-02-091-0/+1
| | * | | | j bln: +termitejeschli2018-02-081-0/+1