From 3e6601688caf2e1745acff59132bc778ffdf1ebb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 1 Apr 2015 20:02:00 +0200
Subject: modules: Revert new system module to enable KSM.

This reverts commit fc53a72f48ae6b567e7bf9901a2bd3657853633c.

Applied upstream at NixOS/nixpkgs@224ed7e.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/module-list.nix                              |  1 -
 modules/system/ksm.nix                               | 20 --------------------
 modules/user/aszlig/profiles/workstation/default.nix |  3 +--
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 modules/system/ksm.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index bebc5ebc..2b7e31b6 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -2,7 +2,6 @@
   ./profiles/common.nix
   ./services/multipath-vpn.nix
   ./services/postfix
-  ./system/ksm.nix
   ./user/aszlig/profiles/base.nix
   ./user/aszlig/profiles/workstation
   ./user/aszlig/programs/gajim
diff --git a/modules/system/ksm.nix b/modules/system/ksm.nix
deleted file mode 100644
index b54cedc9..00000000
--- a/modules/system/ksm.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-{
-  options.vuizvui.system.enableKSM = mkEnableOption "Kernel Same-Page Merging";
-
-  config = mkIf config.vuizvui.system.enableKSM {
-    systemd.services.enable-ksm = {
-      description = "Enable Kernel Same-Page Merging";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "systemd-udev-settle.service" ];
-      script = ''
-        if [ -e /sys/kernel/mm/ksm ]; then
-          echo 1 > /sys/kernel/mm/ksm/run
-        fi
-      '';
-    };
-  };
-}
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 46d6a5fa..c862965e 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -28,6 +28,7 @@ in {
     '') ++ import ./packages.nix pkgs;
 
     hardware = {
+      enableKSM = true;
       pulseaudio.enable = true;
       pulseaudio.package = pkgs.pulseaudio.override {
         useSystemd = true;
@@ -38,8 +39,6 @@ in {
       };
     };
 
-    vuizvui.system.enableKSM = true;
-
     fonts = {
       enableCoreFonts = true;
       enableFontDir = true;
-- 
cgit 1.4.1