testing ghostty and lock update, which results in some build errors. rocmrocmrocm

This commit is contained in:
cnst
2024-12-28 15:06:50 +01:00
parent 3fb3398f59
commit 76e1fb5028
16 changed files with 398 additions and 135 deletions

View File

@@ -4,31 +4,31 @@
config,
...
}: let
inherit (lib) mkOption mkIf;
inherit (lib) mkOption types;
cfg = config.nixos.boot.kernel;
in {
options = {
nixos.boot.kernel = {
variant = mkOption {
type = lib.types.enum ["stable" "latest" "cachyos"];
type = types.enum ["stable" "latest" "cachyos"];
default = "latest";
description = "Kernel variant to use.";
};
hardware = mkOption {
type = lib.types.enum ["amd" "nvidia"];
type = types.enum ["amd" "nvidia"];
default = "amd";
description = "Hardware type (GPU) configuration.";
};
extraKernelParams = mkOption {
type = lib.types.listOf lib.types.str;
type = types.listOf lib.types.str;
default = [];
description = "Additional kernel parameters.";
};
extraBlacklistedModules = mkOption {
type = lib.types.listOf lib.types.str;
type = types.listOf lib.types.str;
default = [];
description = "Additional kernel nixos.to blacklist.";
};

View File

@@ -50,7 +50,7 @@ in {
vulkan-tools
wayland
wayland-protocols
rocmPackages.rocm-smi
# rocmPackages.rocm-smi
];
})
@@ -88,13 +88,13 @@ in {
};
environment.systemPackages = with pkgs; [
vulkanPackages_latest.vulkan-tools
vulkanPackages_latest.vulkan-tools-lunarg
# vulkanPackages_latest.vulkan-tools-lunarg
vulkanPackages_latest.gfxreconstruct
vulkanPackages_latest.spirv-cross
wayland-protocols_git
wayland_git
scx.rustscheds
rocmPackages.rocm-smi
# rocmPackages.rocm-smi
libGL
];
})

View File

@@ -0,0 +1,16 @@
{
config,
lib,
inputs,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.nixos.programs.ghostty;
in {
options = {
nixos.programs.ghostty.enable = mkEnableOption "Enables ghostty";
};
config = mkIf cfg.enable {
environment.systemPackages = [inputs.ghostty.packages.x86_64-linux.default];
};
}

View File

@@ -13,7 +13,6 @@ in {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
lutris
bottles
];
};
}