diff --git a/home/wm/i3bar.nix b/home/wm/i3bar.nix
index e9c85de..62d0d7b 100644
--- a/home/wm/i3bar.nix
+++ b/home/wm/i3bar.nix
@@ -40,8 +40,8 @@ in
             }
             {
               block = "battery";
-              format = "{percentage}% ({time})";
-              full_format = "{percentage}%";
+              format = "{percentage} ({time})";
+              full_format = "{percentage}";
             }
             {
               block = "temperature";
diff --git a/pkgs/bw-pass/default.nix b/pkgs/bw-pass/default.nix
index 95ae0da..b11e7ea 100644
--- a/pkgs/bw-pass/default.nix
+++ b/pkgs/bw-pass/default.nix
@@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec {
 
   src = ./bw-pass;
 
-  phases = [ "buildPhase" "installPhase" "fixupPhase" ];
-
   buildInputs = [
     makeWrapper
     shellcheck
   ];
 
+  dontUnpack = true;
+
   buildPhase = ''
     shellcheck $src
   '';
diff --git a/pkgs/comma/default.nix b/pkgs/comma/default.nix
index f932863..1c10eb2 100644
--- a/pkgs/comma/default.nix
+++ b/pkgs/comma/default.nix
@@ -3,15 +3,15 @@ stdenvNoCC.mkDerivation rec {
   pname = "comma";
   version = "0.1.0";
 
-  src = ./. + "/comma";
-
-  phases = [ "buildPhase" "installPhase" "fixupPhase" ];
+  src = ./comma;
 
   buildInputs = [
     makeWrapper
     shellcheck
   ];
 
+  dontUnpack = true;
+
   buildPhase = ''
     shellcheck $src
   '';
diff --git a/pkgs/diff-flake/default.nix b/pkgs/diff-flake/default.nix
index 090aa6d..c085e67 100644
--- a/pkgs/diff-flake/default.nix
+++ b/pkgs/diff-flake/default.nix
@@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec {
 
   src = ./diff-flake;
 
-  phases = [ "buildPhase" "installPhase" "fixupPhase" ];
-
   buildInputs = [
     makeWrapper
     shellcheck
   ];
 
+  dontUnpack = true;
+
   buildPhase = ''
     shellcheck $src
   '';
diff --git a/pkgs/havm/default.nix b/pkgs/havm/default.nix
index d8856a5..51eb9f0 100644
--- a/pkgs/havm/default.nix
+++ b/pkgs/havm/default.nix
@@ -8,9 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-FDi4FZ8rjGqRkFlROtcJsv+mks7MmIXQGV4bZrwkQrA=";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     ghc
-    which # Used by tests
+  ];
+
+  checkInputs = [
+    which
   ];
 
   doCheck = true;
diff --git a/pkgs/i3-get-window-criteria/default.nix b/pkgs/i3-get-window-criteria/default.nix
index 2e7ce03..acfde93 100644
--- a/pkgs/i3-get-window-criteria/default.nix
+++ b/pkgs/i3-get-window-criteria/default.nix
@@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec {
 
   src = ./i3-get-window-criteria;
 
-  phases = [ "buildPhase" "installPhase" "fixupPhase" ];
-
   buildInputs = [
     makeWrapper
     shellcheck
   ];
 
+  dontUnpack = true;
+
   buildPhase = ''
     shellcheck $src
   '';
diff --git a/pkgs/matrix-notifier/default.nix b/pkgs/matrix-notifier/default.nix
index a7b3a3c..76765a7 100644
--- a/pkgs/matrix-notifier/default.nix
+++ b/pkgs/matrix-notifier/default.nix
@@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec {
     sha256 = "sha256-JiKPDrr9wyD2q5Vsac+OkFdvrDkx6mj/oC7XDVnka74=";
   };
 
-  phases = [ "installPhase" "fixupPhase" ];
-
   nativeBuildInputs = [
     makeWrapper
   ];
diff --git a/pkgs/unbound-zones-adblock/default.nix b/pkgs/unbound-zones-adblock/default.nix
index 2f7ac3f..845c123 100644
--- a/pkgs/unbound-zones-adblock/default.nix
+++ b/pkgs/unbound-zones-adblock/default.nix
@@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = unified-hosts-lists;
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase =
     let
diff --git a/pkgs/unified-hosts-lists/default.nix b/pkgs/unified-hosts-lists/default.nix
index 9fb052a..0da6354 100644
--- a/pkgs/unified-hosts-lists/default.nix
+++ b/pkgs/unified-hosts-lists/default.nix
@@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec {
     sha256 = "sha256-7oYuGegrHVUvAvA16iR8OEe5eTMeSybShSa1PJOe5No=";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out