diff --git a/default.nix b/default.nix
index 80aeb43..674a56e 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,8 @@
-(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-in fetchTarball {
-  url =
-    "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-  sha256 = lock.nodes.flake-compat.locked.narHash;
-}) { src = ./.; }).defaultNix
+(import (let
+  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+in
+  fetchTarball {
+    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash;
+  }) {src = ./.;})
+.defaultNix
diff --git a/flake.nix b/flake.nix
index b5d145d..7b83066 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,9 @@
   description = "clipboard-substitutor";
 
   inputs = {
-    nixpkgs = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
+    nixpkgs = {url = "github:NixOS/nixpkgs/nixpkgs-unstable";};
 
-    flake-utils = { url = "github:numtide/flake-utils"; };
+    flake-utils = {url = "github:numtide/flake-utils";};
 
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -35,60 +35,71 @@
     };
   };
 
-  outputs =
-    { self, nixpkgs, crane, flake-utils, advisory-db, rust-overlay, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ (import rust-overlay) ];
-        };
+  outputs = {
+    self,
+    nixpkgs,
+    crane,
+    flake-utils,
+    advisory-db,
+    rust-overlay,
+    ...
+  }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [(import rust-overlay)];
+      };
 
-        rustStable =
-          pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-        craneLib = (crane.mkLib pkgs).overrideToolchain rustStable;
-        src = ./.;
-        buildInputs = with pkgs;
-          [ xorg.libxcb python39 ] ++ pkgs.lib.optionals stdenv.isDarwin
-          [ pkgs.darwin.apple_sdk.frameworks.AppKit ];
-        cargoArtifacts = craneLib.buildDepsOnly { inherit src buildInputs; };
+      rustStable =
+        pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+      craneLib = (crane.mkLib pkgs).overrideToolchain rustStable;
+      src = ./.;
+      buildInputs = with pkgs;
+        [xorg.libxcb python39]
+        ++ pkgs.lib.optionals stdenv.isDarwin
+        [pkgs.darwin.apple_sdk.frameworks.AppKit];
+      cargoArtifacts = craneLib.buildDepsOnly {inherit src buildInputs;};
 
-        clipboard-substitutor = craneLib.buildPackage {
-          inherit src buildInputs;
-          doCheck = false;
-        };
-        clipboard-substitutor-clippy = craneLib.cargoClippy {
-          inherit cargoArtifacts src buildInputs;
-          cargoClippyExtraArgs = "--all-targets -- --deny warnings";
-        };
-        clipboard-substitutor-fmt = craneLib.cargoFmt { inherit src; };
-        clipboard-substitutor-audit =
-          craneLib.cargoAudit { inherit src advisory-db; };
-        clipboard-substitutor-nextest = craneLib.cargoNextest {
-          inherit cargoArtifacts src buildInputs;
-          partitions = 1;
-          partitionType = "count";
-        };
-      in {
-        checks = {
-          # TODO: migrate to cargo-audit
-          # clipboard-substitutor-audit
-          inherit clipboard-substitutor clipboard-substitutor-clippy
-            clipboard-substitutor-fmt clipboard-substitutor-nextest;
-        };
+      clipboard-substitutor = craneLib.buildPackage {
+        inherit src buildInputs;
+        doCheck = false;
+      };
+      clipboard-substitutor-clippy = craneLib.cargoClippy {
+        inherit cargoArtifacts src buildInputs;
+        cargoClippyExtraArgs = "--all-targets -- --deny warnings";
+      };
+      clipboard-substitutor-fmt = craneLib.cargoFmt {inherit src;};
+      clipboard-substitutor-audit =
+        craneLib.cargoAudit {inherit src advisory-db;};
+      clipboard-substitutor-nextest = craneLib.cargoNextest {
+        inherit cargoArtifacts src buildInputs;
+        partitions = 1;
+        partitionType = "count";
+      };
+    in {
+      checks = {
+        # TODO: migrate to cargo-audit
+        # clipboard-substitutor-audit
+        inherit
+          clipboard-substitutor
+          clipboard-substitutor-clippy
+          clipboard-substitutor-fmt
+          clipboard-substitutor-nextest
+          ;
+      };
 
-        packages.default = clipboard-substitutor;
+      packages.default = clipboard-substitutor;
 
-        apps.default = flake-utils.lib.mkApp { drv = clipboard-substitutor; };
+      apps.default = flake-utils.lib.mkApp {drv = clipboard-substitutor;};
 
-        devShells.default = pkgs.mkShell {
-          inputsFrom = builtins.attrValues self.checks;
+      devShells.default = pkgs.mkShell {
+        inputsFrom = builtins.attrValues self.checks;
 
-          nativeBuildInputs = with pkgs; [
-            cargo-nextest
-            cargo-release
-            rustStable
-          ];
-        };
-      });
+        nativeBuildInputs = with pkgs; [
+          cargo-nextest
+          cargo-release
+          rustStable
+        ];
+      };
+    });
 }
diff --git a/shell.nix b/shell.nix
index fa2a56c..98958bc 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,8 @@
-(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-in fetchTarball {
-  url =
-    "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-  sha256 = lock.nodes.flake-compat.locked.narHash;
-}) { src = ./.; }).shellNix
+(import (let
+  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+in
+  fetchTarball {
+    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash;
+  }) {src = ./.;})
+.shellNix