From 7d030a2c6859bb453dc6ab5ae2ea15714048cd8f Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Sun, 16 Aug 2015 23:59:26 +0200
Subject: makefu: add allow-discards

---
 makefu/2configs/sda-crypto-root.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'makefu')

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";
     };
   };
 }
-- 
cgit v1.2.3


From d06cbb6c2c53ea9c7674753e50bb083b0f3f34f1 Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Sun, 16 Aug 2015 23:59:56 +0200
Subject: makefu:add ramverdoppler

---
 makefu/2configs/tp-x200.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'makefu')

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;
-- 
cgit v1.2.3


From 7a8ad46524a8c34eccaaa102c6a47f264259975c Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Mon, 17 Aug 2015 00:01:03 +0200
Subject: makefu:add disable_v6

---
 makefu/2configs/disable_v6.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 makefu/2configs/disable_v6.nix

(limited to 'makefu')

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" ];
+}
-- 
cgit v1.2.3