diff --git a/flake.lock b/flake.lock
index 70d6f9f..52869ed 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,32 @@
         "type": "gitlab"
       }
     },
+    "comma": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "naersk": "naersk",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "utils": [
+          "flake-utils-plus",
+          "flake-utils"
+        ]
+      },
+      "locked": {
+        "lastModified": 1650481854,
+        "narHash": "sha256-CZQLigKovJbMoTbPuWT3SBSMymjD58m72O/oy+HilQg=",
+        "owner": "nix-community",
+        "repo": "comma",
+        "rev": "034a9ca440370fc1eccbed43ff345fb6ea1f0d27",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "comma",
+        "type": "github"
+      }
+    },
     "dwarffs": {
       "inputs": {
         "nix": [
@@ -60,6 +86,22 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648199409,
+        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1653893745,
@@ -145,6 +187,28 @@
         "type": "github"
       }
     },
+    "naersk": {
+      "inputs": {
+        "nixpkgs": [
+          "comma",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1650101877,
+        "narHash": "sha256-IYxYc5Z1ZHQDTQbTWsOZ9HlZepsVjgV5oZwmbKzxSJs=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "8cc379478819e6a22ce7595a761fe1e17c8d7458",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
     "nix": {
       "inputs": {
         "lowdown-src": "lowdown-src",
@@ -309,6 +373,7 @@
     },
     "root": {
       "inputs": {
+        "comma": "comma",
         "dwarffs": "dwarffs",
         "emacs-overlay": "emacs-overlay",
         "flake-utils-plus": "flake-utils-plus",
diff --git a/flake.nix b/flake.nix
index a4388df..626eafb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,6 +45,15 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
+
+    comma = {
+      url = "github:nix-community/comma";
+      # TODO: change to nixpkgs when updating to NixOS-22.05;
+      inputs = {
+        nixpkgs.follows = "nixpkgs-unstable";
+        utils.follows = "flake-utils-plus/flake-utils";
+      };
+    };
   };
 
   outputs = { self, nixpkgs, flake-utils-plus, ... }@inputs:
@@ -76,6 +85,7 @@
         (final: prev: {
           unstable = channels.nixpkgs-unstable;
         })
+        (flake-utils-plus.lib.genPkgOverlay inputs.comma "comma")
         inputs.nix.overlay
         inputs.emacs-overlay.overlay
       ];
diff --git a/users/ellmau/default.nix b/users/ellmau/default.nix
index 7f9b8ca..9b03241 100644
--- a/users/ellmau/default.nix
+++ b/users/ellmau/default.nix
@@ -24,6 +24,11 @@
   xdg = {
     enable = true;
   };
+
+  home.packages = with pkgs; [
+    comma
+  ];
+  
   programs = {
     alacritty = {
       enable = true;