diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index fa30e586..bfb83838 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -15,6 +15,7 @@ let
     virtualenvwrapper
   ];
   python-with-my-packages = pkgs.python3.withPackages my-python-packages;
+  all-hies = import (fetchTarball "https://github.com/infinisil/all-hies/tarball/master") {};
   taffySource = pkgs.lib.sourceByRegex ../dotfiles/config/taffybar [
     "taffybar.hs" "imalison-taffybar.cabal"
   ];
@@ -84,6 +85,7 @@ in
     };
   };
 
+  xdg.menus.enable = true;
   environment.systemPackages = with pkgs; [
 
     # Applications
@@ -121,7 +123,7 @@ in
     plasma5.breeze-qt5
     gnome-breeze
 
-    # Desktop
+    # Haskell Desktop
     (haskellPackages.callCabal2nix "imalison-taffybar" taffySource { })
     (haskellPackages.callCabal2nix "imalison-xmonad" xmonadSource { })
     (ntiHaskellPackages.callCabal2nix "notifications-tray-icon" notifications-tray-icon-source { })
@@ -129,6 +131,8 @@ in
     haskellPackages.status-notifier-item
     haskellPackages.xmonad
 
+    # Desktop
+    taffybar
     autorandr
     betterlockscreen
     blueman
@@ -172,6 +176,8 @@ in
     ghc
     stack
     haskellPackages.hasktags
+    haskellPackages.hoogle
+    (all-hies.selection { selector = p: { inherit (p) ghc864; }; })
 
     # Scala
     sbt
@@ -247,6 +253,7 @@ in
 
     # Nix
     nix-prefetch-git
+    cachix
 
     # Miscellaneous
     android-udev-rules
diff --git a/nixos/machines/dfinity-blade15.nix b/nixos/machines/ivanm-dfinity-razer.nix
similarity index 98%
rename from nixos/machines/dfinity-blade15.nix
rename to nixos/machines/ivanm-dfinity-razer.nix
index 07dca23e..75fcd243 100644
--- a/nixos/machines/dfinity-blade15.nix
+++ b/nixos/machines/ivanm-dfinity-razer.nix
@@ -9,6 +9,7 @@
     ../configuration.nix
     ../extra.nix
     ../dfinity.nix
+    /etc/nixos/cachix.nix
   ];
 
   hardware.bumblebee.enable = true;