summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-01-16 16:31:07 +0100
committerlassulus <lass@lassul.us>2017-01-16 16:31:07 +0100
commit6c67ed13c4e8dcb7bd212cf95f3f58ce568f34c6 (patch)
treef6cf8e24abc29875f9b69643006c924c3b76b4c6 /tv/2configs
parent7b4c67d2929b6d83525162a6677772a73ad60d08 (diff)
parentb7954019d9ecffbb914f310e97cd647ff32e33f7 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/hw/w110er.nix8
-rw-r--r--tv/2configs/urlwatch.nix2
2 files changed, 4 insertions, 6 deletions
diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix
index aa82924..787bfc6 100644
--- a/tv/2configs/hw/w110er.nix
+++ b/tv/2configs/hw/w110er.nix
@@ -12,9 +12,11 @@
boot.initrd.availableKernelModules = [ "ahci" ];
boot.kernelModules = [ "kvm-intel" ];
- boot.loader.gummiboot.enable = true;
+ boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
+ hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
+
networking.wireless.enable = true;
nix = {
@@ -31,10 +33,6 @@
HandleSuspendKey=ignore
'';
- services.xserver = {
- vaapiDrivers = [ pkgs.vaapiIntel ];
- };
-
system.activationScripts.powertopTunables = ''
echo 1 > /sys/module/snd_hda_intel/parameters/power_save
echo 1500 > /proc/sys/vm/dirty_writeback_centisecs
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index b345909..6e11e02 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -47,7 +47,7 @@ with import <stockholm/lib>;
#http://hackage.haskell.org/package/web-page
# ref <stockholm/krebs/3modules>, services.openssh.knownHosts.github*
- https://help.github.com/articles/what-ip-addresses-does-github-use-that-i-should-whitelist/
+ https://help.github.com/articles/github-s-ip-addresses/
# <stockholm/tv/2configs/xserver/xserver.conf.nix>
# is derived from `configFile` in: