Do not install media role on neelix.

This commit is contained in:
Tom Alexander 2025-01-23 21:06:11 -05:00
parent cdc4bdffb6
commit e1a274c88e
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 20 additions and 10 deletions

View File

@ -46,4 +46,5 @@
me.launch_keyboard.enable = true; me.launch_keyboard.enable = true;
me.sway.enable = true; me.sway.enable = true;
me.lvfs.enable = true; me.lvfs.enable = true;
me.media.enable = true;
} }

View File

@ -84,7 +84,7 @@ in
}; };
}; };
environment.variables.EDITOR = "${pkgs.my_emacs}/bin/plainmacs"; environment.variables.EDITOR = "plainmacs";
} }
(lib.mkIf (config.me.graphical) { (lib.mkIf (config.me.graphical) {
nixpkgs.overlays = [ nixpkgs.overlays = [

View File

@ -21,20 +21,21 @@ in
{ {
imports = [ ]; imports = [ ];
config = ( options.me = {
media.enable = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = "Whether we want to install media.";
};
};
config = lib.mkIf config.me.media.enable (
lib.mkMerge [ lib.mkMerge [
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ffmpeg ffmpeg
]; ];
home-manager.users.talexander =
{ pkgs, ... }:
{
home.file.".config/mpv/mpv.conf" = {
source = ./files/mpv.conf;
};
};
} }
(lib.mkIf config.me.graphical { (lib.mkIf config.me.graphical {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -44,6 +45,14 @@ in
# So far I prefer imv over swayimg because imv supports the 'p' hotkey to print the currently-viewed file to stdout (useful for pipelines) and afaik doesn't support the exec:// protocol which seems like a massive risk. # So far I prefer imv over swayimg because imv supports the 'p' hotkey to print the currently-viewed file to stdout (useful for pipelines) and afaik doesn't support the exec:// protocol which seems like a massive risk.
imv imv
]; ];
home-manager.users.talexander =
{ pkgs, ... }:
{
home.file.".config/mpv/mpv.conf" = {
source = ./files/mpv.conf;
};
};
}) })
(lib.mkIf (config.me.graphics_card_type == "amd" || config.me.graphics_card_type == "intel") { (lib.mkIf (config.me.graphics_card_type == "amd" || config.me.graphics_card_type == "intel") {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [