summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-03-01 15:51:48 +0100
committermakefu <github@syntax-fehler.de>2017-03-05 16:56:53 +0100
commit4eeecc9dbde44592451ef1295593e69fe80473cc (patch)
treea44f5f6fe3995f789dd07c528f13980bbe1cf9bf /makefu
parentf23801beae6c54ca225df3d60d3dc1b0cda5471b (diff)
m 1 x: do not use virtualbox, build with exfat-nofuse
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/x.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 57e120e63..1e29876e7 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -8,7 +8,7 @@
[ # base
../.
../2configs/main-laptop.nix
- ../2configs/laptop-utils.nix
+ ../2configs/tools/all.nix
../2configs/laptop-backup.nix
../2configs/dnscrypt.nix
@@ -46,7 +46,7 @@
../2configs/mail-client.nix
../2configs/printer.nix
../2configs/virtualization.nix
- ../2configs/virtualization-virtualbox.nix
+ # ../2configs/virtualization-virtualbox.nix
../2configs/wwan.nix
../2configs/rad1o.nix
@@ -64,7 +64,9 @@
../2configs/fs/sda-crypto-root-home.nix
];
- makefu.server.primary-itf = "wlp2s0";
+ boot.kernelParams = [ "acpi_osi=Linux" "acpi_backlight=vendor" ];
+
+ makefu.server.primary-itf = "wlp3s0";
makefu.full-populate = true;
makefu.umts.apn = "web.vodafone.de";
@@ -75,6 +77,7 @@
servers.default.server-names = [ "_" ];
};
+ boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ];
virtualisation.docker.enable = true;