From 24b5528f5761f99e093f2e334eba8bec1a626736 Mon Sep 17 00:00:00 2001
From: idcretard <singh.amneesh1784@gmail.com>
Date: Wed, 7 Apr 2021 19:07:29 +0530
Subject: [PATCH] random changes

---
 Hardware/xorg.nix     |  6 ++---
 Packages/override.nix | 30 ++++++++++---------------
 Packages/scripts      |  2 +-
 Stuff/sound.nix       | 51 ++++++++++++++++++++++++-------------------
 4 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/Hardware/xorg.nix b/Hardware/xorg.nix
index ca0a7d8..6327722 100644
--- a/Hardware/xorg.nix
+++ b/Hardware/xorg.nix
@@ -7,9 +7,9 @@
       enable = true;
       libinput= {
         enable = true;
-        mouse = {
-          accelSpeed = "0";
-        };
+ #       mouse = {
+ #         accelSpeed = "0";
+ #       };
         touchpad = {
           middleEmulation = false;
           clickMethod = "buttonareas";
diff --git a/Packages/override.nix b/Packages/override.nix
index 0ac42a5..e882415 100644
--- a/Packages/override.nix
+++ b/Packages/override.nix
@@ -4,24 +4,8 @@
   environment.systemPackages = with pkgs; [
     (callPackage ./customscripts.nix {})
     (callPackage ./mpd_discord_richpresence.nix {})
-    (dwm.overrideAttrs (oldAttrs: rec {
-      src = ./dwm;
-  #    src = fetchFromGitHub {
-   #     owner = "natto1784";
-    #    repo = "dwm";
-     #   rev = "363951cb05142f4c423af561a05658e74be7c768";
-    #    sha256 ="003sl6w5dkycw8wcymvhi843xjngsys6qsl3fc5b9vpyd1l7i0sr";
-   #   };
-    }))
-    (st.overrideAttrs (oldAttrs: rec {
-     src = ./st;
-     #src = fetchFromGitHub {
-       # owner = "natto1784";
-      #  repo = "st";
-      #  rev = "0cd1e394e6d07c5f605ae23070c40de9690bafb1";
-      #  sha256 = "0riqg63aghx71v3rrpic3mxhcxqhry20312bicwbf3ks7ndl13hi";
-  #    };
-    }))
+    (dwm.overrideAttrs (oldAttrs: rec {src = ./dwm;}))
+    (st.overrideAttrs (oldAttrs: rec {src = ./st;}))
    (dmenu.overrideAttrs (oldAttrs: rec {
      configFile = writeText "config.def.h" (builtins.readFile ./dmenu/config.def.h);
      postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
@@ -31,6 +15,16 @@
       colemak-dh = writeText "colemak-dh.map" (builtins.readFile ./colemak-dh.map);
       postInstall = "${oldAttrs.postInstall}\n cp ${colemak-dh} $out/share/keymaps/i386/colemak/colemak-dh.map\n gzip $out/share/keymaps/i386/colemak/colemak-dh.map";
     }))
+    (picom.overrideAttrs (oldAttrs: rec{
+      version = "Next";
+      src = fetchFromGitHub {
+        owner = "yshui";
+        repo = "picom";
+        rev = "v${version}";
+        sha256 = "0asp2hg1jx909kl7i876mcx00vwg9w2swr9i6d786iwgs247dc9i";
+        fetchSubmodules = true;
+      };
+    }))
     ncmpcpp
   ];
   nixpkgs.overlays = [
diff --git a/Packages/scripts b/Packages/scripts
index 5119751..207f4ca 160000
--- a/Packages/scripts
+++ b/Packages/scripts
@@ -1 +1 @@
-Subproject commit 51197513c5924e77e2a76817a7c044b57b49bd30
+Subproject commit 207f4ca68ecf797778ca9e2d4028ea96a1710e08
diff --git a/Stuff/sound.nix b/Stuff/sound.nix
index 7baf777..fba6924 100644
--- a/Stuff/sound.nix
+++ b/Stuff/sound.nix
@@ -1,28 +1,33 @@
 {lib, config, pkgs, ... }:
 
 {
-
-#services.pipewire = {
-# enable = true;
-#  pulse.enable = true;
-# config.pipewire = {
-#  context.properties = {
-#   default.clock.min-quantum = 8;
-# };
-#};
-# config.pipewire-pulse = {
-#  context.modules = {
-#     pulse.min.req = "4/48000";           # 0.08ms
-#    pulse.min.quantum = "4/48000";         # 0.08ms
-#};
-#stream.properties = {
-#  node.latency = "4/48000";
-# };
-#};
-#};
-  sound.enable = true;
-  hardware = {
-    pulseaudio.enable = true;
-    pulseaudio.support32Bit = true;
+  services.pipewire = {
+    enable = true;
+#    alsa = {
+#      enable = true;
+#      support32Bit = true;
+#    };
+    pulse = {
+      enable = true;
+    };
+    config.pipewire = {
+      context.properties = {
+        default.clock.min-quantum = 8;
+      };
+    }; 
+    config.pipewire-pulse = {
+      context.modules = {
+        pulse.min.req = "4/24000";           
+        pulse.min.quantum = "4/24000";
+      };
+      stream.properties = {
+        node.latency = "4/24000";
+      };
+    };
   };
+  sound.enable = true;
+#  hardware = {
+#    pulseaudio.enable = true;
+#    pulseaudio.support32Bit = true;
+#  };
 }