mirror of
https://github.com/aviallon/nixos-lib.git
synced 2026-04-05 17:27:50 +00:00
[General] Update to 24.11
Drop kwin backports Drop removed printing packages
This commit is contained in:
parent
69ee53452d
commit
d04b4a1f7d
11 changed files with 9 additions and 57 deletions
|
|
@ -5,7 +5,7 @@ let
|
|||
devCfg = config.aviallon.developer;
|
||||
generalCfg = config.aviallon.general;
|
||||
in {
|
||||
config = mkIf (cfg.enable && cfg.kernelDriver == "amdgpu") {
|
||||
config = mkIf (cfg.enable && cfg.kernelDriver == "amdgpu") {
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
|
||||
aviallon.boot.cmdline = {
|
||||
|
|
@ -39,8 +39,6 @@ in {
|
|||
hardware.amdgpu.amdvlk.enable = cfg.defaultVulkanImplementation == "amdvlk";
|
||||
hardware.amdgpu.amdvlk.support32Bit.enable = mkDefault config.hardware.amdgpu.amdvlk.enable;
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -32,9 +32,7 @@ in {
|
|||
backend = [ "amd" ];
|
||||
};
|
||||
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
};
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
aviallon.hardware.mesa.enable = mkDefault (!cfg.useProprietary);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ in
|
|||
};
|
||||
|
||||
boot.initrd.kernelModules = [ "i915" ];
|
||||
hardware.opengl = {
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; []
|
||||
++ [
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.corectrl.enable = mkDefault config.hardware.opengl.enable;
|
||||
programs.corectrl.enable = mkDefault config.hardware.graphics.enable;
|
||||
|
||||
aviallon.hardware.mesa.package = mkIf cfg.unstable pkgs.unstable.mesa;
|
||||
aviallon.hardware.mesa.package32 = mkIf cfg.unstable pkgs.unstable.driversi686Linux.mesa;
|
||||
|
|
@ -71,7 +71,7 @@ in {
|
|||
optimizePkg { lto = false; } cfg.package32);
|
||||
};
|
||||
|
||||
hardware.opengl = {
|
||||
hardware.graphics = {
|
||||
package = with pkgs; cfg.internal.package.drivers;
|
||||
package32 = with pkgs; cfg.internal.package32.drivers;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
||||
aviallon.programs.nvtop = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -144,11 +144,11 @@ in {
|
|||
# For now, prefer using package overrides
|
||||
# aviallon.programs.config.cudaSupport = mkDefault true;
|
||||
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
nvidia-vaapi-driver
|
||||
];
|
||||
|
||||
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
|
||||
hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [
|
||||
nvidia-vaapi-driver
|
||||
];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue