Skip to content

Commit c62df19

Browse files
authored
treewide: use lib.singleton (#763)
backport of #754
1 parent 743ad1d commit c62df19

File tree

10 files changed

+72
-92
lines changed

10 files changed

+72
-92
lines changed

modules/alacritty/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
let
44
package = pkgs.alacritty;
@@ -10,12 +10,10 @@ in
1010
inherit package;
1111
};
1212

13-
home-manager.sharedModules = [
14-
{
15-
programs.alacritty = {
16-
enable = true;
17-
inherit package;
18-
};
19-
}
20-
];
13+
home-manager.sharedModules = lib.singleton {
14+
programs.alacritty = {
15+
enable = true;
16+
inherit package;
17+
};
18+
};
2119
}

modules/emacs/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
let
44
package = pkgs.emacs;
@@ -10,12 +10,10 @@ in
1010
inherit package;
1111
};
1212

13-
home-manager.sharedModules = [
14-
{
15-
programs.emacs = {
16-
enable = true;
17-
inherit package;
18-
};
19-
}
20-
];
13+
home-manager.sharedModules = lib.singleton {
14+
programs.emacs = {
15+
enable = true;
16+
inherit package;
17+
};
18+
};
2119
}

modules/firefox/testbed.nix

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
let
44
package = pkgs.firefox;
@@ -10,15 +10,13 @@ in
1010
inherit package;
1111
};
1212

13-
home-manager.sharedModules = [
14-
{
15-
programs.firefox = {
16-
enable = true;
17-
inherit package;
18-
profiles.stylix.isDefault = true;
19-
};
13+
home-manager.sharedModules = lib.singleton {
14+
programs.firefox = {
15+
enable = true;
16+
inherit package;
17+
profiles.stylix.isDefault = true;
18+
};
2019

21-
stylix.targets.firefox.profileNames = [ "stylix" ];
22-
}
23-
];
20+
stylix.targets.firefox.profileNames = [ "stylix" ];
21+
};
2422
}

modules/foot/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
let
44
package = pkgs.foot;
@@ -10,12 +10,10 @@ in
1010
inherit package;
1111
};
1212

13-
home-manager.sharedModules = [
14-
{
15-
programs.foot = {
16-
enable = true;
17-
inherit package;
18-
};
19-
}
20-
];
13+
home-manager.sharedModules = lib.singleton {
14+
programs.foot = {
15+
enable = true;
16+
inherit package;
17+
};
18+
};
2119
}

modules/hyprland/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
environment.loginShellInit = lib.getExe pkgs.hyprland;
55
programs.hyprland.enable = true;
66

7-
home-manager.sharedModules = [
8-
{
9-
wayland.windowManager.hyprland = {
10-
enable = true;
7+
home-manager.sharedModules = lib.singleton {
8+
wayland.windowManager.hyprland = {
9+
enable = true;
1110

12-
# We need something to open a window so that we can check the window borders
13-
settings.bind = [ "ALT, RETURN, exec, ${lib.getExe pkgs.foot}" ];
14-
};
15-
}
16-
];
11+
# We need something to open a window so that we can check the window borders
12+
settings.bind = [ "ALT, RETURN, exec, ${lib.getExe pkgs.foot}" ];
13+
};
14+
};
1715
}

modules/kitty/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
let
44
package = pkgs.kitty;
@@ -10,12 +10,10 @@ in
1010
inherit package;
1111
};
1212

13-
home-manager.sharedModules = [
14-
{
15-
programs.kitty = {
16-
enable = true;
17-
inherit package;
18-
};
19-
}
20-
];
13+
home-manager.sharedModules = lib.singleton {
14+
programs.kitty = {
15+
enable = true;
16+
inherit package;
17+
};
18+
};
2119
}

modules/qutebrowser/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
let
44
package = pkgs.qutebrowser;
@@ -10,12 +10,10 @@ in
1010
inherit package;
1111
};
1212

13-
home-manager.sharedModules = [
14-
{
15-
programs.qutebrowser = {
16-
enable = true;
17-
inherit package;
18-
};
19-
}
20-
];
13+
home-manager.sharedModules = lib.singleton {
14+
programs.qutebrowser = {
15+
enable = true;
16+
inherit package;
17+
};
18+
};
2119
}

modules/vscode/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
# We are using VSCodium because VSCode is an unfree package
44
let
@@ -11,12 +11,10 @@ in
1111
inherit package;
1212
};
1313

14-
home-manager.sharedModules = [
15-
{
16-
programs.vscode = {
17-
enable = true;
18-
inherit package;
19-
};
20-
}
21-
];
14+
home-manager.sharedModules = lib.singleton {
15+
programs.vscode = {
16+
enable = true;
17+
inherit package;
18+
};
19+
};
2220
}

modules/wezterm/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
let
44
package = pkgs.wezterm;
@@ -10,12 +10,10 @@ in
1010
inherit package;
1111
};
1212

13-
home-manager.sharedModules = [
14-
{
15-
programs.wezterm = {
16-
enable = true;
17-
inherit package;
18-
};
19-
}
20-
];
13+
home-manager.sharedModules = lib.singleton {
14+
programs.wezterm = {
15+
enable = true;
16+
inherit package;
17+
};
18+
};
2119
}

modules/zathura/testbed.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, ... }:
1+
{ lib, pkgs, ... }:
22

33
let
44
package = pkgs.zathura;
@@ -10,12 +10,10 @@ in
1010
inherit package;
1111
};
1212

13-
home-manager.sharedModules = [
14-
{
15-
programs.zathura = {
16-
enable = true;
17-
inherit package;
18-
};
19-
}
20-
];
13+
home-manager.sharedModules = lib.singleton {
14+
programs.zathura = {
15+
enable = true;
16+
inherit package;
17+
};
18+
};
2119
}

0 commit comments

Comments
 (0)