summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/hw
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-27 20:55:19 +0200
committerlassulus <lass@lassul.us>2017-06-27 20:55:19 +0200
commit7b43fe5543e20a50d06ebbbb08a9461859b48460 (patch)
tree9c30ef11e9ea852c3232478045e48c5d73341fe9 /makefu/2configs/hw
parent0e607fe1bc50b596301086b064a74232d7126f5c (diff)
parentd58e8035b4101b20539279247ec083b72ba0a647 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/hw')
-rw-r--r--makefu/2configs/hw/exfat-nofuse.nix4
-rw-r--r--makefu/2configs/hw/stk1160.nix3
-rw-r--r--makefu/2configs/hw/wwan.nix8
3 files changed, 13 insertions, 2 deletions
diff --git a/makefu/2configs/hw/exfat-nofuse.nix b/makefu/2configs/hw/exfat-nofuse.nix
new file mode 100644
index 000000000..ca3485e9f
--- /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 b4d033d76..e73741e26 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 000000000..0eb0c97d7
--- /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";
+ };
+}