diff --git a/pkgsets/cpp.nix b/pkgsets/cpp.nix
index 5b01123..02ca4df 100644
--- a/pkgsets/cpp.nix
+++ b/pkgsets/cpp.nix
@@ -6,6 +6,6 @@
     cmake
     gcc
     global
-#    irony-server
+    irony-server
   ];
 }
diff --git a/pkgsets/haskell.nix b/pkgsets/haskell.nix
index bfd468f..46d2174 100644
--- a/pkgsets/haskell.nix
+++ b/pkgsets/haskell.nix
@@ -1,7 +1,9 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  config.machine.pkgsets.haskell.pkgwrap = (pkgs.haskellPackages.ghcWithPackages (pkgs: config.machine.pkgsets.haskell.pkgs));
+let
+  fn = import ../fn.nix { inherit lib; };
+in {
+  config.machine.pkgsets.haskell.pkgwrap = (pkgs.haskellPackages.ghcWithPackages (pkgs: (fn.pkgFilter config.machine.pkgsets.haskell.pkgs)));
   config.machine.pkgsets.haskell.pkgs = with pkgs.haskellPackages; [
     hindent
     mtl
diff --git a/pkgsets/python3.nix b/pkgsets/python3.nix
index 4936f75..87a9cf7 100644
--- a/pkgsets/python3.nix
+++ b/pkgsets/python3.nix
@@ -1,9 +1,10 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
+  fn = import ../fn.nix { inherit lib; };
   gitpkgs = import /nixpkgs {};
 in {
-  config.machine.pkgsets.python3.pkgwrap = (pkgs.python38Full.withPackages (ps: with ps; config.machine.pkgsets.python3.pkgs));
+  config.machine.pkgsets.python3.pkgwrap = (pkgs.python38Full.withPackages (ps: with ps; (fn.pkgFilter config.machine.pkgsets.python3.pkgs)));
   config.machine.pkgsets.python3.pkgs = with pkgs.python38Packages; [
     GitPython
     bpython