Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: use lib.singleton #754

Merged
merged 3 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions modules/alacritty/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.alacritty;
Expand All @@ -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;
};
};
}
16 changes: 7 additions & 9 deletions modules/emacs/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.emacs;
Expand All @@ -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;
};
};
}
20 changes: 9 additions & 11 deletions modules/firefox/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.firefox;
Expand All @@ -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" ];
};
}
16 changes: 7 additions & 9 deletions modules/foot/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.foot;
Expand All @@ -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;
};
};
}
16 changes: 7 additions & 9 deletions modules/ghostty/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:
let
package = pkgs.ghostty;
in
Expand All @@ -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;
};
};
}
16 changes: 7 additions & 9 deletions modules/hyprland/testbed.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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}" ];
};
};
}
16 changes: 7 additions & 9 deletions modules/kitty/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.kitty;
Expand All @@ -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;
};
};
}
16 changes: 7 additions & 9 deletions modules/qutebrowser/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.qutebrowser;
Expand All @@ -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;
};
};
}
16 changes: 7 additions & 9 deletions modules/vscode/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

# We are using VSCodium because VSCode is an unfree package
let
Expand All @@ -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;
};
};
}
16 changes: 7 additions & 9 deletions modules/wezterm/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.wezterm;
Expand All @@ -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;
};
};
}
22 changes: 10 additions & 12 deletions modules/yazi/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.yazi;
Expand All @@ -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
];
};
}
16 changes: 7 additions & 9 deletions modules/zathura/testbed.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:

let
package = pkgs.zathura;
Expand All @@ -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;
};
};
}
Loading