summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-29 00:38:22 +0200
committerlassulus <lassulus@lassul.us>2017-07-29 00:38:22 +0200
commit5ff77c7c64fe8eb94004a77718e70cfa14a3c9c4 (patch)
treeb9ceba038f1e54fe68dd3ff94b551535554cd0fa /makefu/1systems
parentc575f32d56b53ecbc1bcf28342f4eff683b7818c (diff)
parent17497235e84985f9b2ec4acda47f15a9fe68453e (diff)
Merge remote-tracking branch 'gum/master' into HEAD
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/darth/config.nix2
-rw-r--r--makefu/1systems/filepimp/config.nix8
-rw-r--r--makefu/1systems/pnp/config.nix1
-rw-r--r--makefu/1systems/tsp/config.nix3
4 files changed, 7 insertions, 7 deletions
diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix
index c8d17ca70..e0f90b8dd 100644
--- a/makefu/1systems/darth/config.nix
+++ b/makefu/1systems/darth/config.nix
@@ -18,7 +18,7 @@ in {
<stockholm/makefu/2configs/virtualization.nix>
<stockholm/makefu/2configs/tinc/retiolum.nix>
- <stockholm/makefu/2configs/temp-share-samba.nix>
+ <stockholm/makefu/2configs/share/temp-share-samba.nix>
];
services.samba.shares = {
isos = {
diff --git a/makefu/1systems/filepimp/config.nix b/makefu/1systems/filepimp/config.nix
index 65e81af66..e9058ec85 100644
--- a/makefu/1systems/filepimp/config.nix
+++ b/makefu/1systems/filepimp/config.nix
@@ -44,7 +44,7 @@ in {
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
};
- hardware.enableAllFirmware = true;
+ hardware.enableRedistributableFirmware = true;
hardware.cpu.amd.updateMicrocode = true;
zramSwap.enable = true;
@@ -73,9 +73,9 @@ in {
xfsmount = name: dev:
{ "/media/${name}" = { device = dev; fsType = "xfs"; }; };
in
- # (xfsmount "j0" (part1 jDisk0)) <stockholm/makefu>
- (xfsmount "j1" (part1 jDisk1)) <stockholm/makefu>
- (xfsmount "j2" (part1 jDisk2)) <stockholm/makefu>
+ # (xfsmount "j0" (part1 jDisk0)) //
+ (xfsmount "j1" (part1 jDisk1)) //
+ (xfsmount "j2" (part1 jDisk2)) //
(xfsmount "par0" (part1 jDisk3))
;
diff --git a/makefu/1systems/pnp/config.nix b/makefu/1systems/pnp/config.nix
index cc6326f19..de920cc3f 100644
--- a/makefu/1systems/pnp/config.nix
+++ b/makefu/1systems/pnp/config.nix
@@ -8,7 +8,6 @@
[
<stockholm/makefu>
<stockholm/makefu/2configs/headless.nix>
- ../../krebs/3modules/Reaktor.nix
# these will be overwritten by qemu-vm.nix but will be used if the system
# is directly deployed
diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix
index 7169638d4..75a11d3a7 100644
--- a/makefu/1systems/tsp/config.nix
+++ b/makefu/1systems/tsp/config.nix
@@ -10,7 +10,8 @@
<stockholm/makefu/2configs/gui/base.nix>
<stockholm/makefu/2configs/fs/sda-crypto-root.nix>
# hardware specifics are in here
- <stockholm/makefu/2configs/hw/tp-x200.nix #< imports tp-x2x0.nix>
+ # imports tp-x2x0.nix
+ <stockholm/makefu/2configs/hw/tp-x200.nix>
<stockholm/makefu/2configs/disable_v6.nix>
<stockholm/makefu/2configs/rad1o.nix>