summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.i:stockholmjeschli2018-01-218-1/+87
|\
| * l: set ssh agentTimeout to 10mlassulus2018-01-201-0/+1
| * l mors.r: use nixUnstablelassulus2018-01-201-1/+1
| * l radio: force play regularlylassulus2018-01-201-0/+1
| * Merge branch 'staging/jeschli' of prism.r:stockholmjeschli2018-01-192-0/+24
| |\
| | * j bln: +virtualboxMarkus Hihn2018-01-192-0/+24
| | * Merge branch 'master' of prism.r:stockholmMarkus Hihn2018-01-174-39/+5
| | |\
| | * \ Merge branch 'master' of prism.r:stockholmMarkus Hihn2018-01-1611-35/+91
| | |\ \
| * | | | jeschli: +IMjeschli2018-01-191-0/+56
| * | | | Merge branch 'master' of prism.r:stockholmjeschli2018-01-199-49/+41
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-01-1611-35/+91
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| * | | | jeschli: +irc aliasjeschli2018-01-121-0/+3
| * | | | jeschli enklave: import IMwjeschli2018-01-121-0/+1
* | | | | j: +bolidejeschli2018-01-214-0/+210
| |_|/ / |/| | |
* | | | l nixpkgs: 92d088e -> d9a2891lassulus2018-01-181-1/+1
* | | | l zsh: add fzflassulus2018-01-181-2/+5
* | | | l copyq: run as user servicelassulus2018-01-181-4/+3
* | | | l baseX: run xmonad as user servicelassulus2018-01-181-2/+27
* | | | l helios.r: remove broken systemctl startlassulus2018-01-181-1/+0
| |_|/ |/| |
* | | Merge remote-tracking branch 'ni/master'lassulus2018-01-162-36/+2
|\ \ \
| * | | tv ju: RIPtv2018-01-161-34/+0
| * | | Merge remote-tracking branch 'prism/master'tv2018-01-1626-63/+339
| |\ \ \ | | | |/ | | |/|
| * | | tv vim: mkdirs -> need-dirstv2018-01-161-2/+2
* | | | reaktor-plugins url-title: don't strip youtubelassulus2018-01-161-1/+1
* | | | l git: don't show verbose git loglassulus2018-01-161-2/+2
| |/ / |/| |
* | | l nixpkgs: d202e30 -> 92d088elassulus2018-01-161-1/+1
* | | l zsh: cleanuplassulus2018-01-161-16/+18
* | | l: add more emailslassulus2018-01-161-0/+5
* | | l: add zshlassulus2018-01-161-5/+6
* | | l browsers: add finlassulus2018-01-161-3/+4
* | | l browsers: preconfigure chromiumlassulus2018-01-161-0/+8
* | | l browsers: use precedencelassulus2018-01-161-1/+4
* | | l: add taskwarrior to pkgslassulus2018-01-161-0/+2
* | | l prism.r: add downloading (again)lassulus2018-01-161-0/+1
* | | l prism.r: allow jeschli push to all brancheslassulus2018-01-161-1/+1
* | | l: add minecraft.nixlassulus2018-01-162-7/+22
* | | l daedalus.r: install some softwarelassulus2018-01-161-0/+3
* | | l: add lassul.us dnslassulus2018-01-161-0/+15
* | | repo-sync: don't announce syncs in irclassulus2018-01-111-1/+1
| |/ |/|
* | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-109-3/+118
|\ \
| * | jeschli retiolum: connect to enklavejeschli2018-01-101-0/+4
| * | jeschli: +enklave.rjeschli2018-01-104-0/+110
| * | jeschli: set default hostnamejeschli2018-01-103-2/+2
| * | Merge branch 'master' of prism.r:stockholmjeschli2018-01-091-1/+1
| |\ \
| * | | jeschli: meltdown fixMarkus Hihn2018-01-092-1/+2
* | | | Merge remote-tracking branch 'gum/master'lassulus2018-01-105-2/+66
|\ \ \ \
| * | | | ma photostore.krebsco.de: init on gum.rmakefu2018-01-104-1/+65
| * | | | Merge branch 'master' of http://cgit.ni/stockholmmakefu2018-01-098-14/+17
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of prism:stockholmmakefu2018-01-092-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | pkgs.internetarchive: remove fetchPypi, coming from python3Packagesmakefu2018-01-081-1/+1