talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not update refs when rebasing.

Browse Source
This commit is contained in:
Tom Alexander 2025-08-06 22:23:16 -04:00
parent 03ae8d3b0a
commit dde8be4d9f
No known key found for this signature in database
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nix/configuration/roles/chromium/default.nix
View File

@ -22,7 +22,7 @@
{ } { }
(lib.mkIf config.me.graphical { (lib.mkIf config.me.graphical {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(chromium.override { enableWideVine = true; }) chromium
]; ];
allowedUnfree = [ allowedUnfree = [
"chromium" "chromium"
@ -57,8 +57,18 @@
}; };
}; };
# Enabling vulkan causes video to render as white nixpkgs.overlays = [
# nixpkgs.config.chromium.commandLineArgs = "--enable-features=Vulkan"; (final: prev: {
chromium = prev.chromium.override {
enableWideVine = true;
commandLineArgs = [
"--enable-features=AcceleratedVideoEncoder"
# Enabling vulkan causes video to render as white
# "--enable-features=Vulkan";
];
};
})
];
}) })
] ]
); );

3
nix/configuration/roles/git/files/gitconfig_home
View File

@ -50,4 +50,5 @@
[rebase] [rebase]
autoSquash = true autoSquash = true
autoStash = 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