talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not install docker on neelix.

Browse Source
This commit is contained in:
Tom Alexander 2025-01-23 19:09:59 -05:00
parent 0e370c0d62
commit 812dc40257
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
6 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/configuration/hosts/neelix/default.nix
View File

@ -26,6 +26,6 @@
me.bluetooth.enable = true; me.bluetooth.enable = true;
me.emacs_flavor = "plainmacs"; me.emacs_flavor = "plainmacs";
me.graphical = true; me.graphical = true;
me.graphicsCardType = "intel"; me.graphics_card_type = "intel";
me.kodi.enable = true; me.kodi.enable = true;
} }

3
nix/configuration/hosts/odo/default.nix
View File

@ -34,8 +34,9 @@
me.ares.enable = true; me.ares.enable = true;
me.chromecast.enable = true; me.chromecast.enable = true;
me.chromium.enable = true; me.chromium.enable = true;
me.docker.enable = true;
me.emacs_flavor = "full"; me.emacs_flavor = "full";
me.graphical = true; me.graphical = true;
me.graphicsCardType = "amd"; me.graphics_card_type = "amd";
me.sway.enable = true; me.sway.enable = true;
} }

15
nix/configuration/roles/docker/default.nix
View File

@ -8,6 +8,18 @@
{ {
imports = [ ]; imports = [ ];
options.me = {
docker.enable = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = "Whether we want to install docker.";
};
};
config = lib.mkIf config.me.docker.enable (
lib.mkMerge [
{
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
# Use docker activation # Use docker activation
virtualisation.docker.enableOnBoot = false; virtualisation.docker.enableOnBoot = false;
@ -47,3 +59,6 @@
# Needed for non-rootless docker # Needed for non-rootless docker
users.users.talexander.extraGroups = [ "docker" ]; users.users.talexander.extraGroups = [ "docker" ];
} }
]
);
}

2
nix/configuration/roles/global_options/default.nix
View File

@ -12,7 +12,7 @@
}; };
# options.me.graphicsCardType = lib.mkOption { # options.me.graphics_card_type = lib.mkOption {
# type = lib.types.nullOr ( # type = lib.types.nullOr (
# lib.types.enum [ # lib.types.enum [
# "amd" # "amd"

2
nix/configuration/roles/graphics/default.nix
View File

@ -8,7 +8,7 @@
{ {
imports = [ ]; imports = [ ];
options.me.graphicsCardType = lib.mkOption { options.me.graphics_card_type = lib.mkOption {
type = lib.types.nullOr ( type = lib.types.nullOr (
lib.types.enum [ lib.types.enum [
"amd" "amd"

2
nix/configuration/roles/media/default.nix
View File

@ -45,7 +45,7 @@ in
imv imv
]; ];
}) })
(lib.mkIf (config.me.graphicsCardType == "amd" || config.me.graphicsCardType == "intel") { (lib.mkIf (config.me.graphics_card_type == "amd" || config.me.graphics_card_type == "intel") {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cast_file_vaapi cast_file_vaapi
]; ];