From d8f6c52b76feaeac9240a9749f2b38c19f155b9e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Jun 2017 16:00:37 +0200
Subject: ma hw: refactor

---
 makefu/2configs/hw/exfat-nofuse.nix | 4 ++++
 makefu/2configs/hw/stk1160.nix      | 3 +--
 makefu/2configs/hw/wwan.nix         | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 makefu/2configs/hw/exfat-nofuse.nix
 create mode 100644 makefu/2configs/hw/wwan.nix

(limited to 'makefu/2configs/hw')

diff --git a/makefu/2configs/hw/exfat-nofuse.nix b/makefu/2configs/hw/exfat-nofuse.nix
new file mode 100644
index 00000000..ca3485e9
--- /dev/null
+++ b/makefu/2configs/hw/exfat-nofuse.nix
@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
+}
diff --git a/makefu/2configs/hw/stk1160.nix b/makefu/2configs/hw/stk1160.nix
index b4d033d7..e73741e2 100644
--- a/makefu/2configs/hw/stk1160.nix
+++ b/makefu/2configs/hw/stk1160.nix
@@ -1,9 +1,8 @@
 { pkgs, ... }:
 {
   # TODO: un-pin linuxPackages somehow
-  boot.kernelPackages = builtins.trace "Warning: overriding kernel Packages with 4.9" pkgs.linuxPackages_4_9;
   nixpkgs.config.packageOverrides = pkgs: {
-    linux_4_9 = pkgs.linux_4_9.override {
+    linux_latest = pkgs.linux_latest.override {
         extraConfig = ''
           MEDIA_ANALOG_TV_SUPPORT y
           VIDEO_STK1160_COMMON m
diff --git a/makefu/2configs/hw/wwan.nix b/makefu/2configs/hw/wwan.nix
new file mode 100644
index 00000000..0eb0c97d
--- /dev/null
+++ b/makefu/2configs/hw/wwan.nix
@@ -0,0 +1,8 @@
+_:
+
+{
+  makefu.umts = {
+    enable = true;
+    modem-device = "/dev/serial/by-id/usb-Lenovo_H5321_gw_2D5A51BA0D3C3A90-if01";
+  };
+}
-- 
cgit v1.2.3


From d3af8d37f8e3d806ca3744b7086f8d5e30f72875 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 3 Jul 2017 11:44:47 +0200
Subject: ma x230/pulseaudio: use extraConfig

---
 makefu/2configs/hw/tp-x230.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'makefu/2configs/hw')

diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix
index 2de32dd9..c705b52a 100644
--- a/makefu/2configs/hw/tp-x230.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -44,8 +44,7 @@ with import <stockholm/lib>;
   '';
 
   # enable HDMI output switching with pulseaudio
-  hardware.pulseaudio.configFile = pkgs.writeText "pulse-default-pa" ''
-    ${builtins.readFile "${config.hardware.pulseaudio.package.out}/etc/pulse/default.pa"}
+  hardware.pulseaudio.extraConfig = ''
     load-module module-alsa-sink device=hw:0,3 sink_properties=device.description="HDMIOutput" sink_name="HDMI"
   '';
 
-- 
cgit v1.2.3