summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2018-01-0577-287/+930
|\
| * l IM: add bitlbee configlassulus2018-01-051-0/+11
| * l daedalus.r: add ens* to dhcpcd interfaceslassulus2018-01-051-0/+1
| * l daedalus.r: enable flashlassulus2018-01-051-0/+1
| * Merge remote-tracking branch 'gum/master'lassulus2018-01-055-2/+55
| |\
| | * ma source: back to stablemakefu2018-01-051-1/+1
| | * ma pkgs.bin2iso: initmakefu2018-01-051-0/+28
| | * ma source: retry to bump nixpkgsmakefu2018-01-041-2/+1
| | * ma pkgs.mobility: temp remove exfat-nofusemakefu2018-01-041-1/+1
| | * ma source: cherry-pick latest kernel bumpmakefu2018-01-041-1/+2
| | * ma pkgs.cue2pops: initmakefu2018-01-042-0/+25
| * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-053-4/+12
| |\ \
| * | | l mors.r: remove exfat-nofuselassulus2018-01-051-4/+0
| * | | buildbot slave: don't fail on removelassulus2018-01-051-1/+1
| * | | l prism.r: repo-sync stockholm every 2 minuteslassulus2018-01-051-0/+7
| * | | hotdog.r: remove repo-synclassulus2018-01-052-9/+0
| * | | Merge remote-tracking branch 'ni/master'lassulus2018-01-048-41/+38
| |\ \ \
| | * | | tv: RIP schnabel*tv2018-01-041-18/+0
| | * | | tv: use pkgs.linuxPackages_latesttv2018-01-041-0/+2
| | * | | tv vim: sh.extraStart add writeAshtv2018-01-041-1/+1
| | * | | tv wu: move video driver stuff to w110ertv2018-01-042-6/+17
| | * | | wolf: don't use gone save-diskspacetv2018-01-041-1/+0
| | * | | stockholm: {shell => cmds}.get-versiontv2018-01-021-11/+12
| | * | | Merge remote-tracking branch 'prism/master'tv2018-01-0246-228/+511
| | |\ \ \
| | * | | | tv source: turn dummy_secrets into an argumenttv2018-01-021-4/+6
| * | | | | Merge remote-tracking branch 'gum/master'lassulus2018-01-047-1/+76
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | ma 2/default: use linuxPkackages_latest by defaultmakefu2018-01-041-0/+3
| | * | | | ma tools: add bin2iso to consolesmakefu2018-01-041-0/+1
| | * | | | ma tools: add nix-replmakefu2018-01-041-0/+3
| | * | | | Merge remote-tracking branch 'lass/master'makefu2018-01-0429-111/+392
| | |\ \ \ \
| | * | | | | ma source: fix FUCKWITmakefu2018-01-041-1/+1
| | * | | | | ma tools: add console toolsmakefu2018-01-032-0/+8
| | * | | | | ma pkgs.opl-utils: init at 2017-10-17makefu2018-01-031-0/+27
| | * | | | | ma hdl-dump: initmakefu2018-01-031-0/+33
| * | | | | | fix meltdownlassulus2018-01-041-0/+2
| | |/ / / / | |/| | | |
| * | | | | nixpkgs: cb751f9 -> 0b30c1dlassulus2018-01-041-1/+1
| * | | | | l nixpkgs: 3aec59c -> 0b30c1dlassulus2018-01-041-1/+1
| * | | | | Merge remote-tracking branch 'onondaga/master'lassulus2018-01-033-2/+8
| |\ \ \ \ \
| | * | | | | nin axon: set up ssh keysnin2018-01-033-2/+8
| * | | | | | l: add ableton stufflassulus2018-01-032-0/+21
| |/ / / / /
| * | | | | nin 1 axon config: remove steam partitionnin2018-01-031-4/+0
| * | | | | nin axon: initnin2018-01-023-0/+166
| | |_|/ / | |/| | |
| * | | | hw x220 rngd: mkForce -> mkDefaultlassulus2018-01-021-1/+1
| * | | | iptables: set empty default ruleslassulus2018-01-021-0/+9
| * | | | l reaktor-coders: use new writePython2lassulus2018-01-021-2/+1
| * | | | writers: add writePython{2,3}Binlassulus2018-01-021-0/+6
| * | | | writers: add deps & flake8 to writePython{2,3}lassulus2018-01-021-20/+20
| * | | | bitlbee-discord: cleanuplassulus2018-01-021-3/+3
| * | | | buildbot-all: run deploy testlassulus2017-12-311-0/+1
| * | | | ci: add tests optionlassulus2017-12-311-5/+43