diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-04-01 20:02:00 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-04-01 20:03:49 +0200 |
commit | 3e6601688caf2e1745acff59132bc778ffdf1ebb (patch) | |
tree | 525fb379fc92fd1ae070fcbae9668b2d503856b1 | |
parent | a67197b21270ae4297b3474d875994b80ee65d6c (diff) |
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>
-rw-r--r-- | modules/module-list.nix | 1 | ||||
-rw-r--r-- | modules/system/ksm.nix | 20 | ||||
-rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 3 |
3 files changed, 1 insertions, 23 deletions
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; |