summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/sdev
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-04-18 20:27:52 +0200
committerlassulus <lassulus@lassul.us>2019-04-18 20:27:52 +0200
commitadc7ca2dc7ada2e34362a301f7d7898bec2f4991 (patch)
treeda06b946becc36f78eab3ca0a34d51e6c04a5bcf /makefu/1systems/sdev
parent8b3030a08d69317404470b96f097635b39be2027 (diff)
parent7e99a8215b8ce6d632189c883035e431feb87326 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/sdev')
-rw-r--r--makefu/1systems/sdev/config.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index 2f289d500..66f822c02 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -6,13 +6,13 @@
[ # Include the results of the hardware scan.
<stockholm/makefu>
- <stockholm/makefu/2configs/hw/vbox-guest.nix>
- #{ # until virtualbox-image is fixed
- # imports = [
- # <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
- # ];
- # boot.loader.grub.device = lib.mkForce "/dev/sda";
- #}
+ # <stockholm/makefu/2configs/hw/vbox-guest.nix> # broken since 2019-04-18
+ { # until virtualbox-image is fixed
+ imports = [
+ <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+ ];
+ boot.loader.grub.device = lib.mkForce "/dev/sda";
+ }
<stockholm/makefu/2configs/main-laptop.nix>
# <secrets/extra-hosts.nix>