diff options
| author | makefu <github@syntax-fehler.de> | 2017-11-14 15:36:50 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-11-14 15:36:50 +0100 |
| commit | 1cbc2e5aa359e7e9b4b32c9ef75902576347a6d0 (patch) | |
| tree | 58e29ebaeb133f176247e50736e3d1a324f57121 /makefu | |
| parent | 80aefebe97c1d102369c42e187a14cef29c52b03 (diff) | |
ma hw/stk1160: rip
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/x/config.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/hw/stk1160.nix | 15 |
2 files changed, 4 insertions, 17 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 1524b485f..1dd1a070f 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -62,7 +62,7 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/hw/rtl8812au.nix> <stockholm/makefu/2configs/hw/exfat-nofuse.nix> <stockholm/makefu/2configs/hw/wwan.nix> - <stockholm/makefu/2configs/hw/stk1160.nix> + # <stockholm/makefu/2configs/hw/stk1160.nix> # <stockholm/makefu/2configs/rad1o.nix> # Filesystem @@ -87,7 +87,6 @@ with import <stockholm/lib>; nixpkgs.config.allowUnfree = true; - environment.systemPackages = [ pkgs.passwdqc-utils ]; # configure pulseAudio to provide a HDMI sink as well @@ -105,4 +104,7 @@ with import <stockholm/lib>; ''; # hard dependency because otherwise the device will not be unlocked boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; + + nix.package = pkgs.nixUnstable; + environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ]; } diff --git a/makefu/2configs/hw/stk1160.nix b/makefu/2configs/hw/stk1160.nix deleted file mode 100644 index b3a9e1a5a..000000000 --- a/makefu/2configs/hw/stk1160.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: -{ - # TODO: un-pin linuxPackages somehow - boot.kernelPackages = builtins.trace "Warning: overriding kernel Packages with 4.9" pkgs.linuxPackages; - nixpkgs.config.packageOverrides = pkgs: { - linux_4_9 = pkgs.linux_4_9.override { - extraConfig = '' - MEDIA_ANALOG_TV_SUPPORT y - VIDEO_STK1160_COMMON m - VIDEO_STK1160_AC97 y - VIDEO_STK1160 m - ''; - }; - }; -} |