summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'ni/master'lassulus2017-07-1453-103/+100
|\
| * merge shared into krebstv2017-07-1452-97/+90
| |
| * shell: support --usertv2017-07-132-7/+11
| |
* | l dns-stuff: remove dns42 stufflassulus2017-07-131-1/+0
| |
* | Merge remote-tracking branch 'ni/master'lassulus2017-07-138-270/+68
|\|
| * Merge remote-tracking branch 'prism/master'tv2017-07-1342-192/+256
| |\
| * | tv nixpkgs: 1b57bf2 -> 94941cbtv2017-07-131-1/+1
| | |
| * | tv: systemPackages += kpastetv2017-07-121-0/+1
| | |
| * | tv vim: RIP ctrlptv2017-07-121-42/+2
| | |
| * | tv backup: add xu-home-nomictv2017-07-121-0/+6
| | |
| * | tv pulse: add 32-bit supporttv2017-07-121-1/+14
| | |
| * | Makefile: reimplement {deploy,test} using shelltv2017-07-121-31/+6
| | |
| * | tv xserver: stop feh leaking into systemPackagestv2017-07-121-0/+5
| | |
| * | tv xserver: xrdb without -mergetv2017-07-121-1/+1
| | |
| * | tv xserver: systemPackages += xdotooltv2017-07-121-0/+1
| | |
| * | tv URxvt saveLines: 4096 -> 10000tv2017-07-121-1/+1
| | |
| * | tv Xresources: cleanuptv2017-07-121-193/+30
| | |
* | | l nixpkgs: 0aac3fc -> 67956cclassulus2017-07-131-1/+1
| |/ |/|
* | Merge remote-tracking branch 'ni/master'lassulus2017-07-122-2/+2
|\|
| * tv mu: enable{All => Redistributable}Firmwaretv2017-07-121-1/+1
| |
| * tv wu: enable{All => Redistributable}Firmwaretv2017-07-121-1/+1
| |
* | l git: announce staging* brancheslassulus2017-07-121-1/+1
| |
* | l mail: show multiple recipentslassulus2017-07-121-1/+1
| |
* | lass mors&icarus: swap hardwarelassulus2017-07-122-3/+3
| |
* | Merge remote-tracking branch 'ni/master'lassulus2017-07-120-0/+0
|\|
| * tv alnus source: overrid nixpkgs reftv2017-07-122-1/+1
| |
| * tv source: make nixpkgs ref easily overridabletv2017-07-121-16/+21
| |
| * lib.eval-source: allow source to be a listtv2017-07-121-3/+1
| |
* | Merge branch 'staging/source'lassulus2017-07-1264-282/+403
|\ \
| * | tv alnus source: overrid nixpkgs reftv2017-07-122-1/+1
| | |
| * | tv source: make nixpkgs ref easily overridabletv2017-07-121-16/+21
| | |
| * | lib.eval-source: allow source to be a listtv2017-07-121-3/+1
| | |
| * | lass: add dnsmasq to moduleslassulus2017-07-121-0/+1
| | |
| * | move source config from module system to 1systems/*/source.nixlassulus2017-07-1237-184/+231
| | |
| * | l mail: show recipent in mutt indexlassulus2017-07-121-1/+9
| | |
| * | l mail: use reverse_nameslassulus2017-07-121-1/+5
| | |
| * | l wine: add user to video grouplassulus2017-07-121-1/+4
| | |
| * | l nixpkgs: 2e983f1 -> d72efaclassulus2017-07-121-1/+1
| | |
| * | nin nixpkgs 6916f24 -> 01c3847nin2017-07-121-1/+1
| | |
| * | nin nixpkgs: 0afb6d7 -> 6916f24nin2017-07-121-1/+1
| |/
| * tv x220: enable{All => Redistributable}Firmwaretv2017-07-121-1/+1
| |
| * whatsupnix: exit != 0 on Nix errorstv2017-07-121-5/+22
| |
| * move source config from module system to 1systems/*/source.nixtv2017-07-1024-88/+140
| |
| * shell: don't populate when source doesn't evaluatetv2017-07-081-3/+4
| |
| * shell: call proxy nix-shell with --runtv2017-07-081-1/+1
| |
* | l default: add mainUser to wheellassulus2017-07-111-0/+1
| |
* | l mail: show recipent in mutt indexlassulus2017-07-111-1/+9
| |
* | l mail: use reverse_nameslassulus2017-07-111-1/+5
| |
* | l wine: add user to video grouplassulus2017-07-101-1/+4
| |
* | l nixpkgs: 2e983f1 -> d72efaclassulus2017-07-101-1/+1
| |