summaryrefslogtreecommitdiffstats
path: root/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-11-14 15:36:50 +0100
committermakefu <github@syntax-fehler.de>2017-11-14 15:36:50 +0100
commit6e6a92f4acaf44af6650c764073fbcb5b856a096 (patch)
treedb1901c8c0536bfa3d1ae648a5ece67eee36bab7 /1systems
parent9594d6bdb37802b705fd8afb4ade6c575ea541e5 (diff)
ma hw/stk1160: rip
Diffstat (limited to '1systems')
-rw-r--r--1systems/x/config.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/1systems/x/config.nix b/1systems/x/config.nix
index 1524b485f..1dd1a070f 100644
--- a/1systems/x/config.nix
+++ b/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 ];
}
[cgit] Unable to lock slot /tmp/cgit/7e000000.lock: No such file or directory (2)