diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix
index 762b8a665..949def154 100644
--- a/users/glittershark/system/home/default.nix
+++ b/users/glittershark/system/home/default.nix
@@ -6,8 +6,8 @@ rec {
   nixpkgs = import pkgs.nixpkgsSrc {};
 
   home-manager = (fetchTarball {
-    url = "https://github.com/rycee/home-manager/archive/5f189acce44dc39ea4055bfd8064adaf90d7fb5a.tar.gz";
-    sha256 = "0ibmvg3k9m9yzh8ln3jlh47nrvgg81iy8gpl112wjimlp6gagxw6";
+    url = "https://github.com/rycee/home-manager/archive/152769aed96d4d6f005ab40daf03ec4f5102c763.tar.gz";
+    sha256 = "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc";
   });
 
   home = confPath: import "${home-manager}/modules" {
diff --git a/users/glittershark/system/home/modules/alacritty.nix b/users/glittershark/system/home/modules/alacritty.nix
index 34ccf47f1..1633fb1e6 100644
--- a/users/glittershark/system/home/modules/alacritty.nix
+++ b/users/glittershark/system/home/modules/alacritty.nix
@@ -1,17 +1,36 @@
 { config, lib, pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    alacritty 
-  ];
 
+let
+
+  # TODO(grfn): Find a way to extract this to third_party without too much
+  # effort
+  alacrittyNixpkgs = import (pkgs.fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nixpkgs";
+    rev = "cd9286194a5597e28b8bfb747418dd6af1567eb3";
+    sha256 = "0rwhq7cy4xy25gg2in6vah55psdizz7r187zy7z4c2a7pj2hs7ak";
+  }) {};
+
+in
+
+{
   programs.alacritty = {
     enable = true;
+    package = alacrittyNixpkgs.alacritty;
     settings = {
       font.size = 6;
       font.normal.family = "Meslo LGSDZ Nerd Font";
 
       draw_bold_text_with_bright_colors = false;
 
+      key_bindings = [
+        {
+          key = "Escape";
+          mods = "Control";
+          action = "ToggleViMode";
+        }
+      ];
+
       colors = with import ../common/solarized.nix; rec {
         # Default colors
         primary = {
@@ -43,6 +62,8 @@
           cyan = base1;
           white = base3;
         };
+
+        vi_mode_cursor.cursor = red;
       };
     };
   };
diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix
index 0cd7bf6eb..aef0c3e6f 100644
--- a/users/glittershark/system/home/modules/development.nix
+++ b/users/glittershark/system/home/modules/development.nix
@@ -55,6 +55,8 @@ with lib;
     hyperfine
 
     clj2nix
+    clojure
+    leiningen
 
     pg-dump-upsert
 
@@ -82,11 +84,11 @@ with lib;
 
     delta = {
       enable = true;
-      options = [
-        "--theme 'Solarized (light)'"
-        "--hunk-style" "plain"
-        "--commit-style" "box"
-      ];
+      options = {
+        theme = "Solarized (light)";
+        hunk-style = "plain";
+        commit-style = "box";
+      };
     };
   };