Merge branch 'master' of https://github.com/FelschR/nixos-config

common/base-hardware.nix

@@ -15,10 +15,11 @@
 
   # Bluetooth
   hardware.bluetooth.enable = true;
-  hardware.bluetooth.extraConfig = "
-    [General]
-    Enable=Source,Sink,Media,Socket
-  ";
+  hardware.bluetooth.config = {
+    General = {
+      Enable = "Source,Sink,Media,Socket";
+    };
+  };
 
   # Sound.
   sound.enable = true;

common/gpu-bumblebee.nix

@@ -4,4 +4,13 @@
   # Graphics drivers
   hardware.bumblebee.enable = true;
   hardware.opengl.driSupport32Bit = true;
+
+  hardware.opengl = {
+    driSupport32Bit = true;
+    extraPackages = with pkgs; [
+      vaapiIntel
+      vaapiVdpau
+      libvdpau-va-gl
+    ];
+  };
 }

common/system.nix

@@ -8,12 +8,26 @@
     neovim
   ];
 
-  fonts.enableDefaultFonts = true;
   fonts.fonts = with pkgs; [
     hasklig
   ];
-  fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Color Emoji" ];
-  fonts.fontconfig.defaultFonts.serif = [ "Noto Color Emoji" ];
+  fonts.fontconfig.localConf = ''
+    <fontconfig>
+      <alias binding="weak">
+        <family>sans-serif</family>
+        <prefer>
+          <family>emoji</family>
+        </prefer>
+      </alias>
+      <alias binding="weak">
+        <family>serif</family>
+        <prefer>
+          <family>emoji</family>
+        </prefer>
+      </alias>
+    </fontconfig>
+  '';
 
   services.printing.enable = true;
+  services.fwupd.enable = true;
 }