summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/newest'nin2017-03-0764-224/+483
|\
| * Revert "cd: hart eingeCACt"tv2017-03-072-3/+3
| * tv pulse: talk about hijacking audio devicestv2017-03-061-0/+3
| * tv q: respect terminal width when printing calenderstv2017-03-061-9/+29
| * Merge remote-tracking branch 'gum/master'tv2017-03-0526-143/+266
| |\
| | * m 2 tools: xbacklightmakefu2017-03-051-1/+1
| | * m 2 default: timesyncd replaced ntp in defaultsmakefu2017-03-051-5/+2
| | * m 2 default: suid for sendmailmakefu2017-03-051-1/+4
| | * m 2 tools: updatemakefu2017-03-056-8/+20
| | * m 5 default: auto-detect packagesmakefu2017-03-051-22/+19
| | * m 2 urlwatch: watch exfat-nofusemakefu2017-03-051-0/+3
| | * m 2 owncloud: do not use mysqlmakefu2017-03-051-2/+6
| | * m x230: move specific config to general configmakefu2017-03-052-1/+2
| | * m 1 x: do not use virtualbox, build with exfat-nofusemakefu2017-03-051-3/+6
| | * m 2 printer: use dymo cups drivermakefu2017-03-051-0/+1
| | * main-laptop: use tools,security wrappersmakefu2017-03-051-2/+3
| | * m 1 filepimp: new interfacemakefu2017-03-051-1/+1
| | * k 2 tools/sec: do not deploy mitmproxy (broken)makefu2017-03-051-1/+1
| | * m 2 omo-share: expose media-rwmakefu2017-03-051-9/+2
| | * m 2 central-stats-server: use updated kapacitormakefu2017-03-051-6/+9
| | * m 5 esptool: ninitmakefu2017-03-0510-66/+158
| | * m 5 wol: rm, is now upstreammakefu2017-03-051-22/+0
| | * unstable @ 2017-02-28makefu2017-03-051-2/+2
| | * m x: replace laptop with new x230 (without coreboot)makefu2017-03-052-2/+12
| | * m umts: add apn optionmakefu2017-03-052-1/+9
| | * k 5 dymo-cups-drivers: init at 1.4.0makefu2017-03-051-0/+17
| * | l 2 programs: remove obsolete livestreamerlassulus2017-03-051-1/+0
| |/
| * Merge remote-tracking branch 'ni/master'lassulus2017-03-050-0/+0
| |\
| | * Merge remote-tracking branch 'prism/master'tv2017-03-0549-654/+783
| | |\
| * | | Merge remote-tracking branch 'ni/master'lassulus2017-03-054-19/+10
| |\| | | | |/ | |/|
| | * tv nixpkgs: 53a2baa -> 5b0c9d4tv2017-03-041-1/+1
| | * tv urlwatch: nixos-16.09 -> nixos-17.03tv2017-03-041-1/+1
| | * shared nixpkgs: b8ede35 -> 5b0c9d4tv2017-03-041-1/+1
| | * wolf: drop packageOverride for nanotv2017-03-041-4/+0
| | * git-hooks.irc-announce: append .r to cgit_endpointtv2017-03-041-1/+1
| | * git-hooks.irc-announce: simplify file structuretv2017-03-041-11/+6
| | * mv,tv: security.setuidPrograms -> security.wrapperstv2017-03-025-16/+16
| | * krebs,tv: /var/setuid-wrappers -> /run/wrappers/bintv2017-03-025-6/+6
| | * krebs.setuid: update for nixos-unstabletv2017-03-021-1/+1
| | * tv nixpkgs: 5d03aab -> 53a2baatv2017-03-021-1/+1
| * | l 1 prism: start repo-sync 5mins after bootlassulus2017-03-051-0/+1
| * | l 2 livestream: use python27lassulus2017-03-041-1/+1
| * | s 2: bump nixpkgs to 17.03lassulus2017-03-041-1/+1
| * | l 2 nixpkgs: 53a2baa -> 5b0c9d4lassulus2017-03-041-1/+1
| * | l 2: add mosh to systemPackageslassulus2017-03-041-0/+1
| * | l 2 exim-smarthost: set lassul.us as primarylassulus2017-03-041-0/+1
| * | exim: add primary_host to local_domainslassulus2017-03-041-1/+1
| * | l 2: add livestream.nixlassulus2017-03-042-1/+13
| * | mv,tv: security.setuidPrograms -> security.wrapperstv2017-03-045-16/+16
| * | krebs,tv: /var/setuid-wrappers -> /run/wrappers/bintv2017-03-045-6/+6