From 562c8f4a012d9af2a4d9a05072e85d03fdc088fd Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Wed, 3 Jul 2024 19:50:21 +0200 Subject: [PATCH] Nixos: Disable some deprecated/changed stuff before update --- home/christoph/default.nix | 24 +++++++++++---------- system/nixinator/hardware-configuration.nix | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/home/christoph/default.nix b/home/christoph/default.nix index 4a329542..08586c57 100644 --- a/home/christoph/default.nix +++ b/home/christoph/default.nix @@ -205,7 +205,7 @@ rec { theme = "Foggy-Lake"; }; - vscode.enable = true; + vscode.enable = false; # TODO: Had broken package ms-vscode-cpptools waybar = { enable = true; @@ -641,18 +641,20 @@ rec { # Realtime Motion Interpolation: https://gist.github.com/phiresky/4bfcfbbd05b3c2ed8645 mpv = { enable = true; - # NOTE: wrapMpv explained here: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/applications/video/mpv/wrapper.nix#L84 + + # TODO: wrapMpv was removed + # Explained here: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/applications/video/mpv/wrapper.nix#L84 # wrapMpv gets two args: the mpv derivation and some options # Possible overrides for derivation: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/applications/video/mpv/default.nix#L222 - package = pkgs.wrapMpv (pkgs.mpv-unwrapped.override {vapoursynthSupport = true;}) { - youtubeSupport = true; - extraMakeWrapperArgs = [ - "--prefix" - "LD_LIBRARY_PATH" - ":" - "${pkgs.vapoursynth-mvtools}/lib" - ]; - }; + # package = pkgs.wrapMpv (pkgs.mpv-unwrapped.override {vapoursynthSupport = true;}) { + # youtubeSupport = true; + # extraMakeWrapperArgs = [ + # "--prefix" + # "LD_LIBRARY_PATH" + # ":" + # "${pkgs.vapoursynth-mvtools}/lib" + # ]; + # }; }; # Interactive Cheatsheets diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix index cd362910..5314eb82 100644 --- a/system/nixinator/hardware-configuration.nix +++ b/system/nixinator/hardware-configuration.nix @@ -86,7 +86,7 @@ enable = true; # Vulkan - driSupport = true; + # driSupport = true; # NOTE: Deprecated driSupport32Bit = true; # AMD: https://nixos.wiki/wiki/AMD_GPU