diff --git a/flake.lock b/flake.lock
index ae85ee5..2726b73 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,29 @@
         "type": "github"
       }
     },
+    "comma": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "naersk": "naersk",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1654522640,
+        "narHash": "sha256-0QTVKFLcEq/2GGt2WG75b/1e7MuGBaoFXROkOWsTxUg=",
+        "owner": "nix-community",
+        "repo": "comma",
+        "rev": "13102d58c26267574982465b5b9b5b0f98ca98cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "comma",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -53,6 +76,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-modules-core": {
       "inputs": {
         "nixpkgs": [
@@ -177,6 +216,28 @@
         "type": "github"
       }
     },
+    "naersk": {
+      "inputs": {
+        "nixpkgs": [
+          "comma",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1653413650,
+        "narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "69daaceebe12c070cd5ae69ba38f277bbf033695",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
     "neovim-flake": {
       "inputs": {
         "flake-utils": "flake-utils_3",
@@ -200,7 +261,7 @@
     },
     "neovim-nightly-overlay": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "neovim-flake": "neovim-flake",
         "nixpkgs": "nixpkgs_4"
       },
@@ -416,6 +477,7 @@
     "root": {
       "inputs": {
         "coc-rust-analyzer": "coc-rust-analyzer",
+        "comma": "comma",
         "darwin": "darwin",
         "flake-utils": "flake-utils",
         "hercules-ci-agent": "hercules-ci-agent",
@@ -430,6 +492,21 @@
         "zk-nvim": "zk-nvim"
       }
     },
+    "utils": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "vim-eldar": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index e17ff9f..73be861 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,8 @@
     nixos-vscode-server.flake = false;
     hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent/master";
     nixos-shell.url = "github:Mic92/nixos-shell";
+    comma.url = "github:nix-community/comma";
+    comma.inputs.nixpkgs.follows = "nixpkgs";
 
     # Vim & its plugins (not in nixpkgs)
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
diff --git a/home/terminal.nix b/home/terminal.nix
index e7b2c87..12756fc 100644
--- a/home/terminal.nix
+++ b/home/terminal.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, system, ... }:
 {
   # Key packages required on nixos and macos
   home.packages = with pkgs; [
@@ -9,6 +9,8 @@
 
     # Haskell dev
     ghcid
+
+    inputs.comma.packages.${system}.default
   ];
 
   programs = {