diff --git a/flake.nix b/flake.nix
index 348df62..5e3ce8a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,16 +7,33 @@
 
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
+    easy-dhall-nix.url = "github:justinwoo/easy-dhall-nix";
+    easy-dhall-nix.inputs.nixpkgs.follows = "nixpkgs";
+
+    easy-purescript-nix.url = "github:justinwoo/easy-purescript-nix";
+    easy-purescript-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }: {
-    nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [
-        home-manager.nixosModules.home-manager
-        ./hardware/laptop.nix
-        ./configuration.nix
-      ];
+  outputs = { self, nixpkgs, home-manager, nixos-unstable, easy-purescript-nix
+    , easy-dhall-nix, ... }: {
+      nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        nixpkgs.overlays = [
+          (self: super: {
+            inputs = {
+              inherit nixpkgs;
+              inherit nixos-unstable;
+              inherit easy-dhall-nix;
+              inherit easy-purescript-nix;
+            };
+          })
+        ];
+        modules = [
+          home-manager.nixosModules.home-manager
+          ./hardware/laptop.nix
+          ./configuration.nix
+        ];
+      };
     };
-  };
 }
diff --git a/hardware/laptop.nix b/hardware/laptop.nix
index 59e936c..ee36a3c 100644
--- a/hardware/laptop.nix
+++ b/hardware/laptop.nix
@@ -4,24 +4,28 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
+  # imports =
+  #   [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+  #   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+  # Basically the content of the import above
+  hardware.enableRedistributableFirmware = lib.mkDefault true;
+
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/57846041-f177-45eb-aff3-503006bac638";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/57846041-f177-45eb-aff3-503006bac638";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/01E6-A013";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/01E6-A013";
+    fsType = "vfat";
+  };
 
   swapDevices = [ ];
 
diff --git a/modules/dev/haskell/default.nix b/modules/dev/haskell/default.nix
index b3d60e3..956c76d 100644
--- a/modules/dev/haskell/default.nix
+++ b/modules/dev/haskell/default.nix
@@ -5,7 +5,8 @@
     file.".ghci".source = ./ghci;
 
     packages = with pkgs;
-      [ ghc ghcid hlint cabal-install snack stack ]
+      [ ghc ghcid hlint cabal-install stack ]
+
       ++ (with haskellPackages; [ brittany hoogle hpack ]);
   };
 }
diff --git a/modules/dev/nix.nix b/modules/dev/nix.nix
index 2bf8896..9de53c8 100644
--- a/modules/dev/nix.nix
+++ b/modules/dev/nix.nix
@@ -1,7 +1,8 @@
 { pkgs, ... }: {
-  home-manager.users.adrielus.home.packages = with pkgs; [
-    nixfmt
-    niv
-    cached-nix-shell
-  ];
+  home-manager.users.adrielus.home.packages = with pkgs;
+    [
+      nixfmt
+      # niv
+      # cached-nix-shell
+    ];
 }
diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
index dd052fb..bae92c0 100644
--- a/modules/overlays/default.nix
+++ b/modules/overlays/default.nix
@@ -1,4 +1,4 @@
 { ... }: {
-  #    nixpkgs.overlays = [ import ./discord ];
-  imports = [ ./legacy.nix ];
+  nixpkgs.overlays = [ import ./discord ];
+  # imports = [ ./legacy.nix ];
 }