From f9723b1f117a2063cc25f76f4a40632acbda648d Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Tue, 8 Nov 2022 02:53:50 +0530
Subject: [PATCH] hosts/satori: random update

dont use mesa overrides and delete useless comments

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 flake.lock                                    |  6 ++---
 hosts/satori/graphics.nix                     | 25 ++-----------------
 .../satori}/mesa-vulkan-layer-nvidia.patch    |  0
 hosts/satori/pkgs.nix                         |  1 +
 overlays/overridesandshit.nix                 | 20 ---------------
 5 files changed, 6 insertions(+), 46 deletions(-)
 rename {modules => hosts/satori}/mesa-vulkan-layer-nvidia.patch (100%)

diff --git a/flake.lock b/flake.lock
index dfb942a..629f3b7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -157,11 +157,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1663270227,
-        "narHash": "sha256-HWnPdlG+48f5Vgmco2Iij/20AjQuKjaNUJhh/VgbV5Q=",
+        "lastModified": 1667743400,
+        "narHash": "sha256-9HUiy03I9CGN1mQw5dL1wndiBzg7bKa7UV3UDKG8SjI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c2e7745b08a303b468fcaced4bf0774900aba9bc",
+        "rev": "6a36558f5227f728d4fa433ab8ec1b80bebe4f50",
         "type": "github"
       },
       "original": {
diff --git a/hosts/satori/graphics.nix b/hosts/satori/graphics.nix
index 0c8a5fc..4c8025c 100644
--- a/hosts/satori/graphics.nix
+++ b/hosts/satori/graphics.nix
@@ -13,32 +13,11 @@ in
     nvidia-offload
   ];
   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 = {
       driSupport32Bit = true;
       enable = true;
+      package = pkgs.master.mesa.drivers;
+      package32 = pkgs.master.pkgsi686Linux.mesa.drivers;
     };
     nvidia = {
       package = config.boot.kernelPackages.nvidia_x11_vulkan_beta;
diff --git a/modules/mesa-vulkan-layer-nvidia.patch b/hosts/satori/mesa-vulkan-layer-nvidia.patch
similarity index 100%
rename from modules/mesa-vulkan-layer-nvidia.patch
rename to hosts/satori/mesa-vulkan-layer-nvidia.patch
diff --git a/hosts/satori/pkgs.nix b/hosts/satori/pkgs.nix
index cd5b585..d0e7292 100644
--- a/hosts/satori/pkgs.nix
+++ b/hosts/satori/pkgs.nix
@@ -44,6 +44,7 @@
     git = {
       enable = true;
       package = pkgs.master.git.override {
+        doInstallCheck = false;
         sendEmailSupport = true;
         withManual = false;
       };
diff --git a/overlays/overridesandshit.nix b/overlays/overridesandshit.nix
index d9a2111..3e8c85e 100644
--- a/overlays/overridesandshit.nix
+++ b/overlays/overridesandshit.nix
@@ -24,27 +24,7 @@ final: prev: {
     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 (_: {
     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";};
-    });*/
-
 }