diff options
Diffstat (limited to 'makefu/1systems')
-rw-r--r-- | makefu/1systems/darth/config.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/filepimp/config.nix | 8 | ||||
-rw-r--r-- | makefu/1systems/pnp/config.nix | 1 | ||||
-rw-r--r-- | makefu/1systems/tsp/config.nix | 3 |
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> |