diff --git a/modules/default/boot.nix b/modules/default/boot.nix index 8ec0b2f6..4f827d2e 100644 --- a/modules/default/boot.nix +++ b/modules/default/boot.nix @@ -19,7 +19,7 @@ in boot.loader.grub.splashImage = ../../assets/wallpaper/dark.jpg; boot.loader.grub.default = "saved"; boot = { - kernelPackages = pkgs.linuxPackages_6_15; + #kernelPackages = pkgs.linuxPackages_6_15; tmp.cleanOnBoot = true; supportedFilesystems.zfs = lib.mkForce false; # Force disable ZFS kernelParams = diff --git a/modules/default/environments/studio.nix b/modules/default/environments/studio.nix index 253a5f5e..7e29e3af 100644 --- a/modules/default/environments/studio.nix +++ b/modules/default/environments/studio.nix @@ -7,36 +7,36 @@ }: { - config = lib.mkIf(config.glf.environment.enable && (config.glf.environment.edition == "studio" || config.glf.environment.edition == "studio-pro")) { -systemd.tmpfiles.rules = - let - rocmEnv = pkgs.symlinkJoin { - name = "rocm-combined"; - paths = with pkgs-unstable.rocmPackages; [ - rocblas - hipblas - clr + config = lib.mkIf(config.glf.environment.enable && (config.glf.environment.edition == "studio" || config.glf.environment.edition == "studio-pro")) { + systemd.tmpfiles.rules = + let + rocmEnv = pkgs.symlinkJoin { + name = "rocm-combined"; + paths = with pkgs.rocmPackages; [ + rocblas + hipblas + clr + ]; + }; + in [ + "L+ /opt/rocm/hip - - - - ${rocmEnv}" + ]; + + hardware.graphics = { + enable = true; + extraPackages = with pkgs-unstable; [ + mesa.opencl ]; - }; - in [ - "L+ /opt/rocm/hip - - - - ${rocmEnv}" - ]; + }; - hardware.graphics = { - enable = true; - extraPackages = with pkgs-unstable; [ - mesa.opencl # Assure que l'implémentation OpenCL de Mesa (Rusticl) est installée - ]; - }; + environment.variables = { + ROC_ENABLE_PRE_VEGA = "1"; + RUSTICL_ENABLE = "radeonsi"; + }; - environment.variables = { - ROC_ENABLE_PRE_VEGA = "1"; - RUSTICL_ENABLE = "radeonsi"; - }; - environment.systemPackages = if config.glf.environment.edition == "studio-pro" then - with pkgs-unstable; [ + with pkgs; [ blender-hip obs-studio obs-studio-plugins.obs-vkcapture @@ -47,7 +47,7 @@ systemd.tmpfiles.rules = freetube ] else - with pkgs-unstable; [ + with pkgs; [ blender-hip obs-studio obs-studio-plugins.obs-vkcapture @@ -57,6 +57,10 @@ systemd.tmpfiles.rules = audacity freetube ]; - }; + programs.obs-studio = { + enable=true; + package = pkgs-unstable.obs-studio.override {cudaSupport = true;}; + }; + }; } diff --git a/modules/default/gaming.nix b/modules/default/gaming.nix index a61ffaad..ff9f662e 100644 --- a/modules/default/gaming.nix +++ b/modules/default/gaming.nix @@ -29,7 +29,7 @@ in winetricks joystickwake oversteer - linuxKernel.packages.linux_6_15.hid-tmff2 + linuxKernel.packages.linux_6_12.hid-tmff2 mesa glxinfo ];