diff options
| author | jeschli <jeschli@gmail.com> | 2019-04-23 20:15:10 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2019-04-23 20:15:10 +0200 |
| commit | 35fdfbe5ccb3b5844b62ac2486352107484e75d4 (patch) | |
| tree | 561ff21ae90ce6826ab3d74ebd9f27dee7054a0d /makefu/1systems/sdev | |
| parent | a4be985644762dcc2750a366db5780687690ef7d (diff) | |
| parent | cd825d99342050bae35d5373e927ca999bae82cf (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'makefu/1systems/sdev')
| -rw-r--r-- | makefu/1systems/sdev/config.nix | 14 |
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> |