Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2019-04-18 20:27:52 +02:00
commit adc7ca2dc7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
makefu/1systems/sdev/config.nix
View File

@ -6,13 +6,13 @@
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
<stockholm/makefu> <stockholm/makefu>
<stockholm/makefu/2configs/hw/vbox-guest.nix> # <stockholm/makefu/2configs/hw/vbox-guest.nix> # broken since 2019-04-18
#{ # until virtualbox-image is fixed { # until virtualbox-image is fixed
# imports = [ imports = [
# <stockholm/makefu/2configs/fs/single-partition-ext4.nix> <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
# ]; ];
# boot.loader.grub.device = lib.mkForce "/dev/sda"; boot.loader.grub.device = lib.mkForce "/dev/sda";
#} }
<stockholm/makefu/2configs/main-laptop.nix> <stockholm/makefu/2configs/main-laptop.nix>
# <secrets/extra-hosts.nix> # <secrets/extra-hosts.nix>