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 ++++++++
 makefu/2configs/wwan.nix            | 8 --------
 4 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 makefu/2configs/hw/exfat-nofuse.nix
 create mode 100644 makefu/2configs/hw/wwan.nix
 delete mode 100644 makefu/2configs/wwan.nix

(limited to 'makefu')

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";
+  };
+}
diff --git a/makefu/2configs/wwan.nix b/makefu/2configs/wwan.nix
deleted file mode 100644
index 0eb0c97d..00000000
--- a/makefu/2configs/wwan.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-_:
-
-{
-  makefu.umts = {
-    enable = true;
-    modem-device = "/dev/serial/by-id/usb-Lenovo_H5321_gw_2D5A51BA0D3C3A90-if01";
-  };
-}
-- 
cgit v1.2.3