Do not install chromium or catt on neelix.

This commit is contained in:
Tom Alexander 2025-01-23 19:04:19 -05:00
parent 0598c796b7
commit 0e370c0d62
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 73 additions and 41 deletions

View File

@ -32,6 +32,8 @@
me.alacritty.enable = true; me.alacritty.enable = true;
me.ansible.enable = true; me.ansible.enable = true;
me.ares.enable = true; me.ares.enable = true;
me.chromecast.enable = true;
me.chromium.enable = true;
me.emacs_flavor = "full"; me.emacs_flavor = "full";
me.graphical = true; me.graphical = true;
me.graphicsCardType = "amd"; me.graphicsCardType = "amd";

View File

@ -8,7 +8,24 @@
{ {
imports = [ ]; imports = [ ];
environment.systemPackages = with pkgs; [ options.me = {
catt chromecast.enable = lib.mkOption {
]; type = lib.types.bool;
default = false;
example = true;
description = "Whether we want to install chromecast.";
};
};
config = lib.mkIf config.me.chromecast.enable (
lib.mkMerge [
{
environment.systemPackages = with pkgs; [
catt
];
}
(lib.mkIf config.me.graphical {
})
]
);
} }

View File

@ -8,45 +8,58 @@
{ {
imports = [ ]; imports = [ ];
# TODO: Read https://bbs.archlinux.org/viewtopic.php?pid=2209507#p2209507 and apply desired settings. options.me = {
chromium.enable = lib.mkOption {
environment.systemPackages = with pkgs; [ type = lib.types.bool;
(chromium.override { enableWideVine = true; }) default = false;
]; example = true;
description = "Whether we want to install chromium.";
allowedUnfree = [
"chromium"
"chromium-unwrapped"
"widevine-cdm"
];
environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
hideMounts = true;
users.talexander = {
directories = [
{
directory = ".config/chromium";
user = "talexander";
group = "talexander";
mode = "0700";
}
];
};
};
environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
hideMounts = true;
users.talexander = {
directories = [
{
directory = ".cache/chromium";
user = "talexander";
group = "talexander";
mode = "0700";
}
];
}; };
}; };
# Enabling vulkan causes video to render as white config = lib.mkIf config.me.chromium.enable (
# nixpkgs.config.chromium.commandLineArgs = "--enable-features=Vulkan"; lib.mkMerge [
{ }
(lib.mkIf config.me.graphical {
environment.systemPackages = with pkgs; [
(chromium.override { enableWideVine = true; })
];
allowedUnfree = [
"chromium"
"chromium-unwrapped"
"widevine-cdm"
];
environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
hideMounts = true;
users.talexander = {
directories = [
{
directory = ".config/chromium";
user = "talexander";
group = "talexander";
mode = "0700";
}
];
};
};
environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
hideMounts = true;
users.talexander = {
directories = [
{
directory = ".cache/chromium";
user = "talexander";
group = "talexander";
mode = "0700";
}
];
};
};
# Enabling vulkan causes video to render as white
# nixpkgs.config.chromium.commandLineArgs = "--enable-features=Vulkan";
})
]
);
} }