treewide: use lib.singleton (#763)

backport of #754
danth · Jan 9, 2025 · c62df19 · c62df19
1 parent 743ad1d
commit c62df19
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 92 deletions.
diff --git a/modules/alacritty/testbed.nix b/modules/alacritty/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.alacritty;
@@ -10,12 +10,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
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.emacs;
@@ -10,12 +10,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
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.firefox;
@@ -10,15 +10,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
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.foot;
@@ -10,12 +10,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/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
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.kitty;
@@ -10,12 +10,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
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.qutebrowser;
@@ -10,12 +10,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
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 # We are using VSCodium because VSCode is an unfree package
 let
@@ -11,12 +11,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
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.wezterm;
@@ -10,12 +10,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/zathura/testbed.nix b/modules/zathura/testbed.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   package = pkgs.zathura;
@@ -10,12 +10,10 @@ in
     inherit package;
   };
 
-  home-manager.sharedModules = [
-    {
-      programs.zathura = {
-        enable = true;
-        inherit package;
-      };
-    }
-  ];
+  home-manager.sharedModules = lib.singleton {
+    programs.zathura = {
+      enable = true;
+      inherit package;
+    };
+  };
 }