diff --git a/flake.lock b/flake.lock
index dc7c237..773ea41 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,28 @@
 {
   "nodes": {
+    "bang-evaluator": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1619940921,
+        "narHash": "sha256-8HpwzYtrX+qqeo5pm5GygG1EimIX5AMWzzz5IMBkG/0=",
+        "ref": "master",
+        "rev": "08715eacf11e0c086fe8a09d3ccf6e9c91a60de4",
+        "revCount": 50,
+        "type": "git",
+        "url": "https://git.sbruder.de/simon/bangs"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sbruder.de/simon/bangs"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1619345332,
@@ -150,6 +173,7 @@
     },
     "root": {
       "inputs": {
+        "bang-evaluator": "bang-evaluator",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "infinisilSystem": "infinisilSystem",
diff --git a/flake.nix b/flake.nix
index 66fdfe0..ced6d8b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,10 +25,15 @@
 
     infinisilSystem.url = "github:Infinisil/system/91c5df20db68a995155218c5334db0e394185ca8";
     infinisilSystem.flake = false;
+
+    bang-evaluator.url = "git+https://git.sbruder.de/simon/bangs";
+    bang-evaluator.inputs.flake-utils.follows = "flake-utils";
+    bang-evaluator.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
     { self
+    , bang-evaluator
     , flake-utils
     , home-manager
     , infinisilSystem
@@ -151,6 +156,8 @@
             home-manager.nixosModules.home-manager
             sops-nix.nixosModules.sops
 
+            bang-evaluator.nixosModules.bang-evaluator
+
             # NIX_PATH for legacy tooling and flake registry pinning
             {
               nix = {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index e825289..3cbc99a 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -4,8 +4,6 @@ let
   srcs = import ./srcs.nix;
 in
 {
-  bang-evaluator = import srcs.bang-evaluator { pkgs = final; };
-
   bwrap-helper = callPackage ./bwrap-helper { };
 
   osu-lazer = callPackage ./osu-lazer { inherit (prev) osu-lazer; };
diff --git a/pkgs/modules.nix b/pkgs/modules.nix
index 8f0be50..cb81023 100644
--- a/pkgs/modules.nix
+++ b/pkgs/modules.nix
@@ -5,7 +5,6 @@ in
 {
   imports = [
     ./wordclock-dimmer/module.nix
-    "${srcs.bang-evaluator}/module.nix"
     "${srcs.aria2_exporter}/module.nix"
   ];
 }
diff --git a/pkgs/srcs.nix b/pkgs/srcs.nix
index 054b534..d0881d2 100644
--- a/pkgs/srcs.nix
+++ b/pkgs/srcs.nix
@@ -1,8 +1,4 @@
 {
-  bang-evaluator = fetchTarball {
-    url = "https://git.sbruder.de/simon/bangs/archive/ca0d9ed47b21d7424a3b8be7bb55c55c62d17d3a.tar.gz";
-    sha256 = "1dk5lrhfnyqq604ih584kdb9z3zg49rp9y6b0ai3g5i3f0lwcfw7";
-  };
   aria2_exporter = fetchTarball {
     url = "https://github.com/sbruder/aria2_exporter/archive/141a9c0bdbfea2cda4e7a620cc74435a9d549c70.tar.gz";
     sha256 = "1drdhlpfdwsaizi3ys4z6pd0cc19f0rq0ry21b98hphb37cv2cnb";