diff options
| author | lassulus <lassulus@lassul.us> | 2018-01-28 14:50:37 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-01-28 14:50:37 +0100 |
| commit | 044f54b36fa66a72709565ec4a5edcd412ba0198 (patch) | |
| tree | bdd9e2b358b29556df69e5ab6c13f932d9f92a28 /makefu/1systems/x | |
| parent | e55897eb6a195dba6353f79baf7517df99bea379 (diff) | |
| parent | 79ac162a9e967993252d910f5a6bb74c810fd0a1 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x')
| -rw-r--r-- | makefu/1systems/x/config.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 3686acb6e..a32db91e1 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -61,7 +61,7 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/hw/tp-x230.nix> <stockholm/makefu/2configs/hw/rtl8812au.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 @@ -86,6 +86,7 @@ with import <stockholm/lib>; nixpkgs.config.allowUnfree = true; + environment.systemPackages = [ pkgs.passwdqc-utils ]; # configure pulseAudio to provide a HDMI sink as well @@ -103,7 +104,4 @@ 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 ]; } |