diff --git a/modules/alacritty/testbed.nix b/modules/alacritty/testbed.nix
index 602273f5..7c78e033 100644
--- a/modules/alacritty/testbed.nix
+++ b/modules/alacritty/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.alacritty;
@@ -11,12 +11,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.alacritty = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.alacritty = {
+      enable = true;
+      inherit package;
+    };
+  };
 }
diff --git a/modules/emacs/testbed.nix b/modules/emacs/testbed.nix
index ad4116ba..346920bd 100644
--- a/modules/emacs/testbed.nix
+++ b/modules/emacs/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.emacs;
@@ -11,12 +11,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.emacs = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.emacs = {
+      enable = true;
+      inherit package;
+    };
+  };
 }
diff --git a/modules/firefox/testbed.nix b/modules/firefox/testbed.nix
index fb10610e..8738d2e3 100644
--- a/modules/firefox/testbed.nix
+++ b/modules/firefox/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.firefox;
@@ -11,15 +11,13 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.firefox = {
-        enable = true;
-        inherit package;
-        profiles.stylix.isDefault = true;
-      };
+  home-manager.sharedModules = lib.singleton {
+    programs.firefox = {
+      enable = true;
+      inherit package;
+      profiles.stylix.isDefault = true;
+    };
 
-      stylix.targets.firefox.profileNames = [ "stylix" ];
-    }
-  ];
+    stylix.targets.firefox.profileNames = [ "stylix" ];
+  };
 }
diff --git a/modules/foot/testbed.nix b/modules/foot/testbed.nix
index 072bc27d..fd423558 100644
--- a/modules/foot/testbed.nix
+++ b/modules/foot/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.foot;
@@ -11,12 +11,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.foot = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.foot = {
+      enable = true;
+      inherit package;
+    };
+  };
 }
diff --git a/modules/ghostty/testbed.nix b/modules/ghostty/testbed.nix
index 5005de13..e004e60b 100644
--- a/modules/ghostty/testbed.nix
+++ b/modules/ghostty/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 let
   package = pkgs.ghostty;
 in
@@ -9,12 +9,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.ghostty = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.ghostty = {
+      enable = true;
+      inherit package;
+    };
+  };
 }
diff --git a/modules/hyprland/testbed.nix b/modules/hyprland/testbed.nix
index 12ce63c9..d216bf26 100644
--- a/modules/hyprland/testbed.nix
+++ b/modules/hyprland/testbed.nix
@@ -4,14 +4,12 @@
   environment.loginShellInit = lib.getExe pkgs.hyprland;
   programs.hyprland.enable = true;
 
-  home-manager.sharedModules = [
-    {
-      wayland.windowManager.hyprland = {
-        enable = true;
+  home-manager.sharedModules = lib.singleton {
+    wayland.windowManager.hyprland = {
+      enable = true;
 
-        # We need something to open a window so that we can check the window borders
-        settings.bind = [ "ALT, RETURN, exec, ${lib.getExe pkgs.foot}" ];
-      };
-    }
-  ];
+      # We need something to open a window so that we can check the window borders
+      settings.bind = [ "ALT, RETURN, exec, ${lib.getExe pkgs.foot}" ];
+    };
+  };
 }
diff --git a/modules/kitty/testbed.nix b/modules/kitty/testbed.nix
index 3f610764..dc9f3403 100644
--- a/modules/kitty/testbed.nix
+++ b/modules/kitty/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.kitty;
@@ -11,12 +11,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.kitty = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.kitty = {
+      enable = true;
+      inherit package;
+    };
+  };
 }
diff --git a/modules/qutebrowser/testbed.nix b/modules/qutebrowser/testbed.nix
index 1ef1c6c7..b7d4363b 100644
--- a/modules/qutebrowser/testbed.nix
+++ b/modules/qutebrowser/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.qutebrowser;
@@ -11,12 +11,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.qutebrowser = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.qutebrowser = {
+      enable = true;
+      inherit package;
+    };
+  };
 }
diff --git a/modules/vscode/testbed.nix b/modules/vscode/testbed.nix
index 54085738..5bb27532 100644
--- a/modules/vscode/testbed.nix
+++ b/modules/vscode/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 # We are using VSCodium because VSCode is an unfree package
 let
@@ -12,12 +12,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.vscode = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.vscode = {
+      enable = true;
+      inherit package;
+    };
+  };
 }
diff --git a/modules/wezterm/testbed.nix b/modules/wezterm/testbed.nix
index 67a88638..9665ec26 100644
--- a/modules/wezterm/testbed.nix
+++ b/modules/wezterm/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.wezterm;
@@ -11,12 +11,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.wezterm = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.wezterm = {
+      enable = true;
+      inherit package;
+    };
+  };
 }
diff --git a/modules/yazi/testbed.nix b/modules/yazi/testbed.nix
index e7f33260..9372b316 100644
--- a/modules/yazi/testbed.nix
+++ b/modules/yazi/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.yazi;
@@ -11,16 +11,14 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.yazi = {
-        enable = true;
-        inherit package;
-      };
+  home-manager.sharedModules = lib.singleton {
+    programs.yazi = {
+      enable = true;
+      inherit package;
+    };
 
-      home.packages = [
-        pkgs.nerd-fonts.fira-mono
-      ];
-    }
-  ];
+    home.packages = [
+      pkgs.nerd-fonts.fira-mono
+    ];
+  };
 }
diff --git a/modules/zathura/testbed.nix b/modules/zathura/testbed.nix
index 861bfa08..3989452a 100644
--- a/modules/zathura/testbed.nix
+++ b/modules/zathura/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.zathura;
@@ -11,12 +11,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.zathura = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.zathura = {
+      enable = true;
+      inherit package;
+    };
+  };
 }