diff --git a/nix/configuration/roles/chromium/default.nix b/nix/configuration/roles/chromium/default.nix index 36e56fa..9e808d8 100644 --- a/nix/configuration/roles/chromium/default.nix +++ b/nix/configuration/roles/chromium/default.nix @@ -22,7 +22,7 @@ { } (lib.mkIf config.me.graphical { environment.systemPackages = with pkgs; [ - (chromium.override { enableWideVine = true; }) + chromium ]; allowedUnfree = [ "chromium" @@ -57,8 +57,18 @@ }; }; - # Enabling vulkan causes video to render as white - # nixpkgs.config.chromium.commandLineArgs = "--enable-features=Vulkan"; + nixpkgs.overlays = [ + (final: prev: { + chromium = prev.chromium.override { + enableWideVine = true; + commandLineArgs = [ + "--enable-features=AcceleratedVideoEncoder" + # Enabling vulkan causes video to render as white + # "--enable-features=Vulkan"; + ]; + }; + }) + ]; }) ] ); diff --git a/nix/configuration/roles/git/files/gitconfig_home b/nix/configuration/roles/git/files/gitconfig_home index 16a4308..02d4d28 100644 --- a/nix/configuration/roles/git/files/gitconfig_home +++ b/nix/configuration/roles/git/files/gitconfig_home @@ -50,4 +50,5 @@ [rebase] autoSquash = true autoStash = true - updateRefs = true + # updateRefs was annoying when you want to split a branch in two by rebasing away from commits from one branch and rebasing away some commits from another branch. + updateRefs = false