diff --git a/pkgs/pkgsets/cpp.nix b/pkgs/pkgsets/cpp.nix
index 02ca4df..5b01123 100644
--- a/pkgs/pkgsets/cpp.nix
+++ b/pkgs/pkgsets/cpp.nix
@@ -6,6 +6,6 @@
     cmake
     gcc
     global
-    irony-server
+#    irony-server
   ];
 }
diff --git a/pkgs/pkgsets/haskell.nix b/pkgs/pkgsets/haskell.nix
index 59bbe7a..bfd468f 100644
--- a/pkgs/pkgsets/haskell.nix
+++ b/pkgs/pkgsets/haskell.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  config.machine.pkgsets.haskell.pkgwrap = [ (pkgs.haskellPackages.ghcWithPackages (pkgs: config.machine.pkgsets.haskell.pkgs)) ];
+  config.machine.pkgsets.haskell.pkgwrap = (pkgs.haskellPackages.ghcWithPackages (pkgs: config.machine.pkgsets.haskell.pkgs));
   config.machine.pkgsets.haskell.pkgs = with pkgs.haskellPackages; [
     hindent
     mtl
diff --git a/pkgs/pkgsets/python3.nix b/pkgs/pkgsets/python3.nix
index 887d9ce..337f08d 100644
--- a/pkgs/pkgsets/python3.nix
+++ b/pkgs/pkgsets/python3.nix
@@ -3,8 +3,8 @@
 let
   gitpkgs = import /nixpkgs {};
 in {
-  config.machine.pkgsets.python3.pkgwrap = [ (gitpkgs.python3Full.withPackages (ps: with ps; config.machine.pkgsets.python3.pkgs)) ];
-  config.machine.pkgsets.python3.pkgs = with gitpkgs.python3Packages; [
+  config.machine.pkgsets.python3.pkgwrap = (gitpkgs.python3Full.withPackages (ps: with ps; config.machine.pkgsets.python3.pkgs));
+  config.machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
     GitPython
     bpython
     # cairosvg cairocffi