summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ni/master'lassulus2019-01-271-12/+14
|\
| * reaktor2: 0.1.6 -> 0.1.7tv2019-01-261-3/+3
| * reaktor2: 0.1.5 -> 0.1.6tv2019-01-261-12/+14
* | Merge remote-tracking branch 'ni/master'lassulus2019-01-256-23/+18
|\|
| * reaktor2: 0.1.4 -> 0.1.5tv2019-01-251-3/+3
| * blessings: 1.3.0 -> 2.1.0tv2019-01-256-23/+18
* | Merge remote-tracking branch 'ni/master'lassulus2019-01-241-3/+3
|\|
| * reaktor2: 0.1.2 -> 0.1.3tv2019-01-241-3/+3
| * reaktor2: 0.1.1 -> 0.1.2tv2019-01-241-3/+3
* | Merge remote-tracking branch 'ni/master'lassulus2019-01-235-10/+12
|\|
| * Reaktor random-emoji: curl -Stv2019-01-231-1/+1
| * Reaktor scripts: chmod +xtv2019-01-234-0/+0
| * reaktor2: 0.1.0 -> 0.1.1tv2019-01-231-7/+7
| * reaktor2: 0.0.0 -> 0.1.0tv2019-01-231-9/+11
* | Merge remote-tracking branch 'ni/master'lassulus2019-01-221-0/+1
|\|
| * krebs: import reaktor2 servicetv2019-01-221-0/+1
* | Merge remote-tracking branch 'gum/master'lassulus2019-01-2213-54/+101
|\ \
| * | ma pkgs.baidudl: initmakefu2019-01-221-0/+23
| * | ma gui: disable transparencymakefu2019-01-221-0/+1
| * | ma bureautomation: rename plugsmakefu2019-01-221-12/+7
| * | ma krops: bump home-manager refmakefu2019-01-221-1/+1
| * | ma home-manager: set the XDG_DATA_DIRS and GDK_PIXBUF_MODULE_FILE load iconsmakefu2019-01-221-1/+3
| * | ma printer: use splix instead of samsung driversmakefu2019-01-221-1/+2
| * | ma tools: add nix-review, accept sdk licensemakefu2019-01-222-0/+2
| * | ma hw/malduino_elite: initmakefu2019-01-222-0/+16
| * | ma cake.r: update hardware-configmakefu2019-01-221-4/+20
| * | Merge remote-tracking branch 'lass/master'makefu2019-01-217-18/+127
| |\ \
| * \ \ Merge branch 'master' of http://cgit.ni/stockholmmakefu2019-01-2110-170/+207
| |\ \ \
| * | | | ma 2default: extra pathsToLinkmakefu2019-01-211-1/+1
| * | | | Merge remote-tracking branch 'tv/master'makefu2019-01-1623-101/+121
| |\ \ \ \
| * | | | | ma cake.r: remove hack to get wifi workingmakefu2019-01-132-38/+29
* | | | | | l domsen: add backupslassulus2019-01-221-0/+17
* | | | | | l domsen: add UBIK-SFTP accountlassulus2019-01-221-0/+7
* | | | | | l mails: add more addresseslassulus2019-01-221-0/+1
* | | | | | l: add tcpdump to pkgslassulus2019-01-221-0/+1
* | | | | | l yellow.r: rotate nordvpn endpointlassulus2019-01-221-47/+45
* | | | | | l prism.r: add new iplassulus2019-01-221-4/+10
* | | | | | l prism.r: add Mic92 to trustedUserslassulus2019-01-221-0/+10
* | | | | | l prism.r: add uid for download userlassulus2019-01-221-0/+1
* | | | | | l prism.r hfos: update ip addresseslassulus2019-01-221-2/+2
* | | | | | reaktor-krebs: join #nixos-delassulus2019-01-221-0/+1
| |_|_|/ / |/| | | |
* | | | | Mic92: change mail addresslassulus2019-01-211-1/+1
* | | | | external: add idontcare.rlassulus2019-01-211-0/+23
* | | | | Merge remote-tracking branch 'ni/master'lassulus2019-01-2113-170/+294
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | reaktor2 service: inittv2019-01-211-0/+63
| * | | | reaktor2: init at 0.0.0tv2019-01-212-0/+25
| * | | | krebs hosts: extraHost -> hoststv2019-01-211-13/+12
| | |_|/ | |/| |
| * | | krebs: move hosts to dedeicated filetv2019-01-213-25/+38
| * | | krebs: move retiolum-hosts to dedicated filetv2019-01-212-23/+29
| * | | krebs: move dns stuff to dedicated filetv2019-01-214-20/+20