summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-08-17 14:42:50 +0200
committerlassulus <lass@aidsballs.de>2015-08-17 14:42:50 +0200
commit4c39f3c1e54180214c55cf4d3fbfe63449a761b5 (patch)
tree3281ff5928b1062181f37c55a002e3ff4cf143b1 /makefu
parentca4f1e08d54b39623f716e4ff0a49aaa74acb206 (diff)
parentd5ffbf54cbef182d9e2865d75cb94b0713191149 (diff)
Merge branch 'makefu'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/disable_v6.nix4
-rw-r--r--makefu/2configs/sda-crypto-root.nix4
-rw-r--r--makefu/2configs/tp-x200.nix3
3 files changed, 10 insertions, 1 deletions
diff --git a/makefu/2configs/disable_v6.nix b/makefu/2configs/disable_v6.nix
new file mode 100644
index 000000000..37db172ef
--- /dev/null
+++ b/makefu/2configs/disable_v6.nix
@@ -0,0 +1,4 @@
+{
+ networking.enableIPv6 = false;
+ boot.kernelParams = [ "ipv6.disable=1" ];
+}
diff --git a/makefu/2configs/sda-crypto-root.nix b/makefu/2configs/sda-crypto-root.nix
index 0d979a0b8..54db87547 100644
--- a/makefu/2configs/sda-crypto-root.nix
+++ b/makefu/2configs/sda-crypto-root.nix
@@ -10,7 +10,7 @@ with lib;
loader.grub.version =2;
loader.grub.device = "/dev/sda";
- initrd.luks.devices = [ { name = "luksroot"; device= "/dev/sda2";}];
+ initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
};
@@ -18,10 +18,12 @@ with lib;
"/" = {
device = "/dev/mapper/luksroot";
fsType = "ext4";
+ options="defaults,discard";
};
"/boot" = {
device = "/dev/disk/by-label/nixboot";
fsType = "ext4";
+ options="defaults,discard";
};
};
}
diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index 8d41d6806..2bbc75c20 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -17,6 +17,9 @@ with lib;
hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true;
+ zramSwap.enable = true;
+ zramSwap.numDevices = 2;
+
hardware.trackpoint.enable = true;
hardware.trackpoint.sensitivity = 255;
hardware.trackpoint.speed = 255;