fix(tests): Remove unthemed modules from tests

This commit is contained in:
punkfairie 2024-10-20 17:36:53 -07:00
parent f89d1c0f41
commit a49c020fc8
Signed by: punkfairie
GPG key ID: 01823C057725C266
4 changed files with 45 additions and 81 deletions

View file

@ -18,15 +18,9 @@
programs = { programs = {
cava.enable = lib.mkForce false; # NOTE: this may actually work on darwin, but the package is currently not supported cava.enable = lib.mkForce false; # NOTE: this may actually work on darwin, but the package is currently not supported
foot.enable = lib.mkForce false; foot.enable = lib.mkForce false;
fuzzel.enable = lib.mkForce false;
hyprlock.enable = lib.mkForce false;
imv.enable = lib.mkForce false;
mpv.enable = lib.mkForce false; # NOTE: same as cava, but `mpv` fails to build currently
obs-studio.enable = lib.mkForce false;
rio.enable = lib.mkForce false; # marked as broken rio.enable = lib.mkForce false; # marked as broken
rofi.enable = lib.mkForce false; rofi.enable = lib.mkForce false;
swaylock.enable = lib.mkForce false; swaylock.enable = lib.mkForce false;
tofi.enable = lib.mkForce false;
waybar.enable = lib.mkForce false; waybar.enable = lib.mkForce false;
}; };
@ -44,4 +38,5 @@
}; };
} }
]; ];
}).activationPackage })
.activationPackage

View file

@ -6,11 +6,11 @@
home-manager-stable, home-manager-stable,
}: }:
lib.optionalAttrs nixpkgs.stdenv.isLinux { lib.optionalAttrs nixpkgs.stdenv.isLinux {
nixos-test-unstable = nixpkgs.callPackage ./nixos.nix { inherit home-manager; }; nixos-test-unstable = nixpkgs.callPackage ./nixos.nix {inherit home-manager;};
nixos-test-stable = nixpkgs-stable.callPackage ./nixos.nix { home-manager = home-manager-stable; }; nixos-test-stable = nixpkgs-stable.callPackage ./nixos.nix {home-manager = home-manager-stable;};
} }
// lib.optionalAttrs nixpkgs.stdenv.isDarwin { // lib.optionalAttrs nixpkgs.stdenv.isDarwin {
darwin-test-unstable = nixpkgs.callPackage ./darwin.nix { inherit home-manager; }; darwin-test-unstable = nixpkgs.callPackage ./darwin.nix {inherit home-manager;};
darwin-test-stable = nixpkgs-stable.callPackage ./darwin.nix { darwin-test-stable = nixpkgs-stable.callPackage ./darwin.nix {
home-manager = home-manager-stable; home-manager = home-manager-stable;
}; };

View file

@ -16,59 +16,25 @@
i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.enabled = "fcitx5";
programs = { programs = {
aerc.enable = true;
alacritty.enable = true; alacritty.enable = true;
bat.enable = true; bat.enable = true;
bottom.enable = true;
btop.enable = true; btop.enable = true;
cava.enable = true; cava.enable = true;
fish.enable = true; fish.enable = true;
foot.enable = true; foot.enable = true;
freetube.enable = true;
fuzzel.enable = true;
fzf.enable = true; fzf.enable = true;
gh-dash.enable = true;
git = {
enable = true;
delta.enable = true;
};
gitui.enable = true;
# this is enabled by default already, but still
# listing explicitly so we know it's tested
glamour.rose-pine.enable = true;
helix.enable = true; helix.enable = true;
hyprlock.enable = true;
imv.enable = true;
k9s.enable = true; k9s.enable = true;
kitty.enable = true; kitty.enable = true;
lazygit.enable = true;
micro.enable = true;
mpv.enable = true;
neovim.enable = true; neovim.enable = true;
newsboat.enable = true;
rio.enable = true; rio.enable = true;
rofi.enable = true; rofi.enable = true;
skim.enable = true;
spotify-player.enable = true;
starship.enable = true; starship.enable = true;
swaylock.enable = true; swaylock.enable = true;
tmux.enable = true; tmux.enable = true;
tofi.enable = true;
obs-studio.enable = true;
waybar.enable = true; waybar.enable = true;
yazi.enable = true;
zathura.enable = true; zathura.enable = true;
zellij.enable = true; zellij.enable = true;
zsh = {
enable = true;
syntaxHighlighting.enable = true;
};
};
qt = {
enable = true;
platformTheme.name = "kvantum";
style.name = "kvantum";
}; };
services = { services = {

View file

@ -1,46 +1,49 @@
{ testers, home-manager }: {
testers,
home-manager,
}:
testers.runNixOSTest { testers.runNixOSTest {
name = "module-test"; name = "module-test";
nodes.machine = nodes.machine = {
{ lib, pkgs, ... }: lib,
{ pkgs,
imports = [ ...
home-manager.nixosModules.default }: {
../modules/nixos imports = [
./common.nix home-manager.nixosModules.default
]; ../modules/nixos
./common.nix
];
boot = { boot = {
loader.grub.enable = true; loader.grub.enable = true;
plymouth.enable = true;
};
services = {
displayManager.sddm = {
enable = true;
package = pkgs.kdePackages.sddm; # our module/the upstream port requires the qt6 version
};
xserver.enable = true; # required for sddm
};
console.enable = true;
users.users.test = {
isNormalUser = true;
home = "/home/test";
};
virtualisation = {
memorySize = 4096;
writableStore = true;
};
home-manager.users.test = {
imports = [ ./home.nix ];
};
}; };
services = {
displayManager.sddm = {
enable = true;
};
xserver.enable = true; # required for sddm
};
console.enable = true;
users.users.test = {
isNormalUser = true;
home = "/home/test";
};
virtualisation = {
memorySize = 4096;
writableStore = true;
};
home-manager.users.test = {
imports = [./home.nix];
};
};
testScript = _: '' testScript = _: ''
machine.start() machine.start()
machine.wait_for_unit("home-manager-test.service") machine.wait_for_unit("home-manager-test.service")