Tried some mesa stuff

This commit is contained in:
2025-10-06 16:06:29 +03:00
parent bb160a1c66
commit a429027fe6
4 changed files with 40 additions and 5 deletions

17
flake.lock generated
View File

@@ -129,11 +129,28 @@
"type": "github"
}
},
"nixpkgs-mesa-pin": {
"locked": {
"lastModified": 1758035966,
"narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"eko": "eko",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-mesa-pin": "nixpkgs-mesa-pin",
"sops-nix": "sops-nix",
"zen-browser": "zen-browser"
}

View File

@@ -23,9 +23,11 @@
url = "github:kyren223/eko/";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs-mesa-pin.url = "github:nixos/nixpkgs/nixos-unstable";
};
outputs = { self, nixpkgs, ... }@inputs: {
outputs = { self, nixpkgs, nixpkgs-mesa-pin, ... }@inputs: {
nixosConfigurations = {
laptop = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
@@ -39,9 +41,17 @@
./hosts/lapsktop.nix
];
};
kyren-desktop = nixpkgs.lib.nixosSystem {
# kyren-desktop = nixpkgs.lib.nixosSystem {
# system = "x86_64-linux";
# specialArgs = { inherit inputs; };
# modules = [
# ./hosts/desktop.nix
# ];
# };
kyren-desktop = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
specialArgs = { inherit inputs; pkgs-mesa-pin = import nixpkgs-mesa-pin { inherit system; config.allowUnfree = true; }; };
modules = [
./hosts/desktop.nix
];

View File

@@ -9,7 +9,7 @@
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
@@ -36,4 +36,10 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.opengl = { enable = true; };
services.xserver.videoDrivers = [ "amdgpu" ];
# environment.variables = {
# AMD_VULKAN_ICD = "RADV"; # Force Mesa RADV over AMDVLK for better perf
# };
}

View File

@@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: {
{ pkgs, pkgs-mesa-pin, lib, config, ... }: {
options.gaming.enable = lib.mkOption {
type = lib.types.bool;
@@ -35,6 +35,8 @@
osu-lazer-bin
lutris
] ++ [
pkgs-mesa-pin.mesa
];
};