hosts/satori: random update

dont use mesa overrides and delete useless comments

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
2022-11-08 02:53:50 +05:30
parent 05a1c4707b
commit f9723b1f11
5 changed files with 6 additions and 46 deletions

6
flake.lock generated
View File

@@ -157,11 +157,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1663270227, "lastModified": 1667743400,
"narHash": "sha256-HWnPdlG+48f5Vgmco2Iij/20AjQuKjaNUJhh/VgbV5Q=", "narHash": "sha256-9HUiy03I9CGN1mQw5dL1wndiBzg7bKa7UV3UDKG8SjI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2e7745b08a303b468fcaced4bf0774900aba9bc", "rev": "6a36558f5227f728d4fa433ab8ec1b80bebe4f50",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -13,32 +13,11 @@ in
nvidia-offload nvidia-offload
]; ];
hardware = { hardware = {
/*opengl =
let
fn = oa: with lib; {
nativeBuildInputs = oa.nativeBuildInputs ++ singleton pkgs.glslang;
mesonFlags = oa.mesonFlags ++ singleton "-Dvulkan-layers=device-select,overlay";
patches = oa.patches ++ singleton ./mesa-vulkan-layer-nvidia.patch;
postInstall = oa.postInstall + ''
mv $out/lib/libVkLayer* $drivers/lib
layer=VkLayer_MESA_device_select
substituteInPlace $drivers/share/vulkan/implicit_layer.d/''${layer}.json \
--replace "lib''${layer}" "$drivers/lib/lib''${layer}"
layer=VkLayer_MESA_overlay
substituteInPlace $drivers/share/vulkan/explicit_layer.d/''${layer}.json \
--replace "lib''${layer}" "$drivers/lib/lib''${layer}"
'';
};
in
with pkgs; {
driSupport32Bit = true;
enable = true;
package = (mesa.overrideAttrs fn).drivers;
package32 = (pkgsi686Linux.mesa.overrideAttrs fn).drivers;
};*/
opengl = { opengl = {
driSupport32Bit = true; driSupport32Bit = true;
enable = true; enable = true;
package = pkgs.master.mesa.drivers;
package32 = pkgs.master.pkgsi686Linux.mesa.drivers;
}; };
nvidia = { nvidia = {
package = config.boot.kernelPackages.nvidia_x11_vulkan_beta; package = config.boot.kernelPackages.nvidia_x11_vulkan_beta;

View File

@@ -44,6 +44,7 @@
git = { git = {
enable = true; enable = true;
package = pkgs.master.git.override { package = pkgs.master.git.override {
doInstallCheck = false;
sendEmailSupport = true; sendEmailSupport = true;
withManual = false; withManual = false;
}; };

View File

@@ -24,27 +24,7 @@ final: prev: {
patches = [ ./patches/st.patch ]; patches = [ ./patches/st.patch ];
}); });
ncmpcpp = prev.ncmpcpp.override {
visualizerSupport = true;
clockSupport = true;
};
/*picom = prev.picom.overrideAttrs (oldAttrs: rec{
src = prev.fetchFromGitHub {
owner = "jonaburg";
repo = "picom";
rev = "a8445684fe18946604848efb73ace9457b29bf80";
sha256 = "sha256-R+YUGBrLst6CpUgG9VCwaZ+LiBSDWTp0TLt1Ou4xmpQ=";
fetchSubmodules = true;
};
});*/
proxychains = prev.proxychains.overrideAttrs (_: { proxychains = prev.proxychains.overrideAttrs (_: {
postInstall = ":"; postInstall = ":";
}); });
/* tor-browser-bundle-bin = prev.tor-browser-bundle-bin.overrideAttrs (_ : {
src = builtins.fetchurl { url = "https://www.torproject.org/dist/torbrowser/10.5.2/tor-browser-linux64-10.5.2_en-US.tar.xz"; sha256="16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb";};
});*/
} }