From 9f2b537bf7863db2f8e11b9d7cfd0014fbe5a2fd Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 31 Dec 2023 15:44:53 -0500
Subject: [PATCH] refactor: use non-flake inputs instead of fetchers

---
 common/home/bash/programs.nix                |   2 +-
 common/home/trash-d/default.nix              |   4 +-
 common/home/trash-d/trash-d.nix              |  11 ++--
 common/overlays/default.nix                  |   8 +--
 common/overlays/dracula-theme/bat.nix        |  20 --------
 common/overlays/dracula-theme/default.nix    |  23 ++++-----
 common/overlays/dracula-theme/git.nix        |  10 ++--
 common/overlays/dracula-theme/plymouth.nix   |  10 ++--
 common/overlays/dracula-theme/wallpaper.nix  |   2 +-
 common/overlays/dracula-theme/xresources.nix |  20 --------
 common/overlays/plymouth/default.nix         |  18 ++-----
 common/overlays/spotifywm/default.nix        |   4 +-
 common/overlays/spotifywm/spotifywm.nix      |  20 +++-----
 common/pkgs/coloryou/default.nix             |   2 +-
 common/pkgs/coloryou/shell.nix               |   2 +-
 common/pkgs/default.nix                      |   4 +-
 common/pkgs/input-emulator/default.nix       |  27 ----------
 common/pkgs/pam-fprint-grosshack/default.nix |  13 ++---
 common/pkgs/pokemon-colorscripts/default.nix |  13 ++---
 common/pkgs/repl/default.nix                 |   1 +
 devices/binto/modules/gpu-replay.nix         |   8 +--
 devices/binto/modules/nix-gaming.nix         |   4 +-
 flake.lock                                   | Bin 31732 -> 37389 bytes
 flake.nix                                    | Bin 4176 -> 6830 bytes
 home/theme.nix                               |   2 +-
 modules/audio.nix                            |   4 +-
 updateSha.sh                                 |  51 -------------------
 27 files changed, 61 insertions(+), 222 deletions(-)
 delete mode 100644 common/overlays/dracula-theme/bat.nix
 delete mode 100644 common/overlays/dracula-theme/xresources.nix
 delete mode 100644 common/pkgs/input-emulator/default.nix

diff --git a/common/home/bash/programs.nix b/common/home/bash/programs.nix
index 3d3af5ed..e00fcc9d 100644
--- a/common/home/bash/programs.nix
+++ b/common/home/bash/programs.nix
@@ -41,7 +41,7 @@
       themes = {
         dracula-bat = {
           src = pkgs.dracula-theme;
-          file = "bat/Dracula.tmTheme";
+          file = "bat";
         };
       };
       extraPackages = with pkgs.bat-extras; [
diff --git a/common/home/trash-d/default.nix b/common/home/trash-d/default.nix
index ecbba28c..5a867455 100644
--- a/common/home/trash-d/default.nix
+++ b/common/home/trash-d/default.nix
@@ -1,5 +1,5 @@
-{pkgs, ...}: let
-  trash = pkgs.callPackage ./trash-d.nix pkgs;
+{pkgs, ...} @ inputs: let
+  trash = pkgs.callPackage ./trash-d.nix inputs;
 in {
   home.packages = [trash];
 
diff --git a/common/home/trash-d/trash-d.nix b/common/home/trash-d/trash-d.nix
index ac066a95..9062e732 100644
--- a/common/home/trash-d/trash-d.nix
+++ b/common/home/trash-d/trash-d.nix
@@ -1,6 +1,6 @@
 {
+  trash-d-src,
   stdenv,
-  fetchFromGitHub,
   dmd,
   dub,
   ronn,
@@ -8,14 +8,9 @@
 }:
 stdenv.mkDerivation {
   name = "trash";
-  version = "unstable";
+  version = trash-d-src.rev;
 
-  src = fetchFromGitHub {
-    owner = "rushsteve1";
-    repo = "trash-d";
-    rev = "d88bb672612761c8e299e717857bf9c85a903e99";
-    hash = "sha256-oPxeoEqOYf6DCg5rJxINqAIlMbxqzAJcZDUY/EzADzY=";
-  };
+  src = trash-d-src;
 
   buildInputs = [dub dmd ronn];
 
diff --git a/common/overlays/default.nix b/common/overlays/default.nix
index 3b894ca8..abab5eb5 100644
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@@ -2,11 +2,11 @@
   neovim-flake,
   nixpkgs-wayland,
   ...
-}: {
+} @ inputs: {
   nixpkgs.overlays = [
-    (import ./dracula-theme)
-    (import ./plymouth)
-    (import ./spotifywm)
+    (import ./dracula-theme inputs)
+    (import ./plymouth inputs)
+    (import ./spotifywm inputs)
     (import ./squeekboard)
 
     neovim-flake.overlay
diff --git a/common/overlays/dracula-theme/bat.nix b/common/overlays/dracula-theme/bat.nix
deleted file mode 100644
index 5e9a9d9e..00000000
--- a/common/overlays/dracula-theme/bat.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "dracula-bat";
-
-  src = fetchFromGitHub {
-    owner = "matt1432";
-    repo = "bat";
-    rev = "270bce892537311ac92494a2a7663e3ecf772092";
-    hash = "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw=";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bat
-    cp -a ./Dracula.tmTheme $out/bat
-  '';
-}
diff --git a/common/overlays/dracula-theme/default.nix b/common/overlays/dracula-theme/default.nix
index 735eb981..422d08a7 100644
--- a/common/overlays/dracula-theme/default.nix
+++ b/common/overlays/dracula-theme/default.nix
@@ -1,17 +1,14 @@
-(final: prev: {
+{
+  bat-theme-src,
+  xresources-theme-src,
+  ...
+} @ inputs: (final: prev: {
   dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: let
-    bat-colors = prev.callPackage ./bat.nix prev;
-    git-colors = prev.callPackage ./git.nix prev;
-    plymouth = prev.callPackage ./plymouth.nix prev;
-    Xresources = prev.callPackage ./xresources.nix prev;
+    git-colors = prev.callPackage ./git.nix inputs;
+    plymouth = prev.callPackage ./plymouth.nix inputs;
     wallpaper = prev.fetchurl (import ./wallpaper.nix);
   in {
-    src = prev.fetchFromGitHub {
-      owner = "dracula";
-      repo = "gtk";
-      rev = "80d5a3fedf280e9cc7f2df3b100a1082c3bcd1cc";
-      hash = "sha256-BPL0Msva1/sPQKPeRJHgvU+xXU3m8b2E6aDBLmXbkkA=";
-    };
+    src = inputs.gtk-theme-src;
 
     installPhase = ''
       runHook preInstall
@@ -19,10 +16,10 @@
       mkdir -p $out/share/plymouth/themes $out/wallpapers
       cp -a ${wallpaper} $out/wallpapers/waves.png
 
-      cp -a ${bat-colors}/bat $out/bat
+      cp -a ${bat-theme-src}/Dracula.tmTheme $out/bat
       cp -a ${git-colors}/git-colors $out/git-colors
       cp -a ${plymouth}/share/plymouth/themes/dracula $out/share/plymouth/themes/
-      cp -a ${Xresources}/xres $out/xres
+      cp -a ${xresources-theme-src}/Xresources $out/xres
 
       # -------------------------------------------
       mkdir -p $out/share/themes/Dracula
diff --git a/common/overlays/dracula-theme/git.nix b/common/overlays/dracula-theme/git.nix
index 8b904f4d..f13840d6 100644
--- a/common/overlays/dracula-theme/git.nix
+++ b/common/overlays/dracula-theme/git.nix
@@ -1,17 +1,13 @@
 {
   stdenv,
-  fetchFromGitHub,
+  git-theme-src,
   ...
 }:
 stdenv.mkDerivation {
   name = "dracula-git";
+  version = git-theme-src.rev;
 
-  src = fetchFromGitHub {
-    owner = "dracula";
-    repo = "git";
-    rev = "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73";
-    hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM=";
-  };
+  src = git-theme-src;
 
   installPhase = ''
     # Git colors
diff --git a/common/overlays/dracula-theme/plymouth.nix b/common/overlays/dracula-theme/plymouth.nix
index f43d43f1..78d2f28f 100644
--- a/common/overlays/dracula-theme/plymouth.nix
+++ b/common/overlays/dracula-theme/plymouth.nix
@@ -1,17 +1,13 @@
 {
   stdenv,
-  fetchFromGitHub,
+  plymouth-theme-src,
   ...
 }:
 stdenv.mkDerivation {
   name = "dracula-plymouth";
+  version = plymouth-theme-src.rev;
 
-  src = fetchFromGitHub {
-    owner = "dracula";
-    repo = "plymouth";
-    rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96";
-    hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA=";
-  };
+  src = plymouth-theme-src;
 
   installPhase = let
     dracula-script = ./dracula-plymouth.patch;
diff --git a/common/overlays/dracula-theme/wallpaper.nix b/common/overlays/dracula-theme/wallpaper.nix
index 95cde496..c1ae71e0 100644
--- a/common/overlays/dracula-theme/wallpaper.nix
+++ b/common/overlays/dracula-theme/wallpaper.nix
@@ -1,4 +1,4 @@
 {
-  url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true";
+  url = "https://raw.githubusercontent.com/aynp/dracula-wallpapers/main/Art/4k/Waves%201.png";
   hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
 }
diff --git a/common/overlays/dracula-theme/xresources.nix b/common/overlays/dracula-theme/xresources.nix
deleted file mode 100644
index 866cf5d4..00000000
--- a/common/overlays/dracula-theme/xresources.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "dracula-xresources";
-
-  src = fetchFromGitHub {
-    owner = "dracula";
-    repo = "xresources";
-    rev = "539ef24e9b0c5498a82d59bfa2bad9b618d832a3";
-    hash = "sha256-6fltsAluqOqYIh2NX0I/LC3WCWkb9Fn8PH6LNLBQbrY=";
-  };
-
-  installPhase = ''
-    mkdir -p $out/xres
-    cp -a ./Xresources $out/xres/
-  '';
-}
diff --git a/common/overlays/plymouth/default.nix b/common/overlays/plymouth/default.nix
index 1c9edcec..0e4eb855 100644
--- a/common/overlays/plymouth/default.nix
+++ b/common/overlays/plymouth/default.nix
@@ -1,16 +1,6 @@
-final: prev: {
+{plymouth-src, ...}: (final: prev: {
   plymouth = prev.plymouth.overrideAttrs (o: {
-    version = "unstable-2023-12-08";
-
-    src = prev.fetchFromGitLab {
-      domain = "gitlab.freedesktop.org";
-      owner = "plymouth";
-      repo = "plymouth";
-
-      # https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/236
-      # Last commit that works
-      rev = "58cc9f84e456ab0510b13d7bdbc13697467ca7be";
-      hash = "sha256-hgQ8nCphR4hc+WTNtS8GgBrC54uYnvTCp7kjgB/u5lE=";
-    };
+    version = plymouth-src.rev;
+    src = plymouth-src;
   });
-}
+})
diff --git a/common/overlays/spotifywm/default.nix b/common/overlays/spotifywm/default.nix
index 32e874cf..14cb47a3 100644
--- a/common/overlays/spotifywm/default.nix
+++ b/common/overlays/spotifywm/default.nix
@@ -1,3 +1,3 @@
-(final: prev: {
-  spotifywm = final.callPackage ./spotifywm.nix {};
+{...} @ inputs: (final: prev: {
+  spotifywm = final.callPackage ./spotifywm.nix inputs;
 })
diff --git a/common/overlays/spotifywm/spotifywm.nix b/common/overlays/spotifywm/spotifywm.nix
index aa65898a..bfeb832c 100644
--- a/common/overlays/spotifywm/spotifywm.nix
+++ b/common/overlays/spotifywm/spotifywm.nix
@@ -2,26 +2,20 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  spotifywm-src,
   libX11,
   makeBinaryWrapper,
   spotify,
   symlinkJoin,
+  ...
 }: let
   spotifywm = stdenv.mkDerivation {
     pname = "spotifywm";
-    version = "unstable-2022-10-25";
+    version = spotifywm-src.rev;
 
-    src = fetchFromGitHub {
-      owner = "dasJ";
-      repo = "spotifywm";
-      rev = "8624f539549973c124ed18753881045968881745";
-      hash = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0=";
-    };
+    src = spotifywm-src;
 
-    buildInputs = [
-      libX11
-    ];
+    buildInputs = [libX11];
 
     installPhase = ''
       runHook preInstall
@@ -35,9 +29,7 @@ in
   symlinkJoin {
     inherit (spotifywm) name;
 
-    nativeBuildInputs = [
-      makeBinaryWrapper
-    ];
+    nativeBuildInputs = [makeBinaryWrapper];
 
     paths = [
       spotify
diff --git a/common/pkgs/coloryou/default.nix b/common/pkgs/coloryou/default.nix
index d4bd1714..537936f0 100644
--- a/common/pkgs/coloryou/default.nix
+++ b/common/pkgs/coloryou/default.nix
@@ -1,4 +1,4 @@
-{python3Packages}:
+{python3Packages, ...}:
 python3Packages.buildPythonPackage {
   pname = "coloryou";
   version = "0.0.1";
diff --git a/common/pkgs/coloryou/shell.nix b/common/pkgs/coloryou/shell.nix
index 761114d9..5ac2d6d6 100644
--- a/common/pkgs/coloryou/shell.nix
+++ b/common/pkgs/coloryou/shell.nix
@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 with pkgs.python311Packages;
-  buildPythonPackage rec {
+  buildPythonPackage {
     name = "coloryou";
     src = ./.;
     propagatedBuildInputs = [material-color-utilities utils];
diff --git a/common/pkgs/default.nix b/common/pkgs/default.nix
index d4b18c90..d17acb4b 100644
--- a/common/pkgs/default.nix
+++ b/common/pkgs/default.nix
@@ -2,10 +2,10 @@
   lib,
   pkgs,
   ...
-}:
+} @ inputs:
 with lib; let
   mkPackage = name: v: {
-    ${name} = pkgs.callPackage ./${name} {};
+    ${name} = pkgs.callPackage ./${name} inputs;
   };
 
   rmNotPackage = name: value:
diff --git a/common/pkgs/input-emulator/default.nix b/common/pkgs/input-emulator/default.nix
deleted file mode 100644
index 5d713831..00000000
--- a/common/pkgs/input-emulator/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  stdenv,
-  meson,
-  ninja,
-  pkg-config,
-  cmake,
-  bash-completion,
-  fetchFromGitHub,
-}:
-stdenv.mkDerivation rec {
-  pname = "input-emulator";
-
-  src = fetchFromGitHub {
-    owner = "tio";
-    repo = pname;
-    rev = "6c35040e6fc4f65ce0519ee76d00d60490bcb987";
-    hash = "sha256-Im0RADqRwlZ/RiZFSVp+HwnWoLdcpRp0Ej6RP0GY0+c=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    cmake
-    bash-completion
-  ];
-}
diff --git a/common/pkgs/pam-fprint-grosshack/default.nix b/common/pkgs/pam-fprint-grosshack/default.nix
index e8252bdf..362542d3 100644
--- a/common/pkgs/pam-fprint-grosshack/default.nix
+++ b/common/pkgs/pam-fprint-grosshack/default.nix
@@ -10,17 +10,14 @@
   systemd,
   pam,
   libpam-wrapper,
-  fetchFromGitLab,
+  pam-fprint-grosshack-src,
+  ...
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "pam-fprint-grosshack";
+  version = pam-fprint-grosshack-src.rev;
 
-  src = fetchFromGitLab {
-    owner = "mishakmak";
-    repo = name;
-    rev = "45b42524fb5783e1e555067743d7e0f70d27888a";
-    hash = "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=";
-  };
+  src = pam-fprint-grosshack-src;
 
   nativeBuildInputs = [
     meson
diff --git a/common/pkgs/pokemon-colorscripts/default.nix b/common/pkgs/pokemon-colorscripts/default.nix
index ad97967b..464fd543 100644
--- a/common/pkgs/pokemon-colorscripts/default.nix
+++ b/common/pkgs/pokemon-colorscripts/default.nix
@@ -1,22 +1,19 @@
 {
   stdenv,
   python3Packages,
-  fetchFromGitLab,
+  pokemon-colorscripts-src,
+  ...
 }:
 stdenv.mkDerivation {
   name = "pokemon-colorscripts";
+  version = pokemon-colorscripts-src.rev;
+
+  src = pokemon-colorscripts-src;
 
   propagatedBuildInputs = with python3Packages; [
     python
   ];
 
-  src = fetchFromGitLab {
-    owner = "phoneybadger";
-    repo = "pokemon-colorscripts";
-    rev = "0483c85b93362637bdd0632056ff986c07f30868";
-    hash = "sha256-rj0qKYHCu9SyNsj1PZn1g7arjcHuIDGHwubZg/yJt7A=";
-  };
-
   installPhase = ''
     mkdir -p $out/pokemon-colorscripts $out/bin
 
diff --git a/common/pkgs/repl/default.nix b/common/pkgs/repl/default.nix
index 1d3f4725..38c3b90a 100644
--- a/common/pkgs/repl/default.nix
+++ b/common/pkgs/repl/default.nix
@@ -3,6 +3,7 @@
   coreutils,
   gnused,
   writeShellScriptBin,
+  ...
 }: let
   repl = ./repl.nix;
   example = command: desc: ''\n\u001b[33m ${command}\u001b[0m - ${desc}'';
diff --git a/devices/binto/modules/gpu-replay.nix b/devices/binto/modules/gpu-replay.nix
index 8691a172..423def99 100644
--- a/devices/binto/modules/gpu-replay.nix
+++ b/devices/binto/modules/gpu-replay.nix
@@ -2,13 +2,13 @@
   pkgs,
   config,
   lib,
+  gpu-screen-recorder-src,
   ...
 }: let
   gsr = pkgs.gpu-screen-recorder.overrideAttrs (o: {
-    src = pkgs.fetchurl {
-      url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r445.84f9a04.tar.gz";
-      hash = "sha256-YKGLv7QFBxTZDW9HKS6tEeP1pX91idtuy0oUr4mbjjU=";
-    };
+    version = gpu-screen-recorder-src.rev;
+
+    src = gpu-screen-recorder-src;
 
     postPatch = "";
 
diff --git a/devices/binto/modules/nix-gaming.nix b/devices/binto/modules/nix-gaming.nix
index e5f4c970..1c9f3efb 100644
--- a/devices/binto/modules/nix-gaming.nix
+++ b/devices/binto/modules/nix-gaming.nix
@@ -3,9 +3,7 @@
   pkgs,
   ...
 }: {
-  imports = [
-    nix-gaming.nixosModules.steamCompat
-  ];
+  imports = [nix-gaming.nixosModules.steamCompat];
 
   programs = {
     steam = {
diff --git a/flake.lock b/flake.lock
index af1de56fbfdc51b5ae3b1bb8d65580e981d4d24d..3bd63c964e70a96429f4dd348f28fdaf84e38c63 100644
GIT binary patch
delta 3412
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
E0ExyzoB#j-

delta 795
zcmYL{&uf!+9LI^xs_rs{p(`8dIyUW0S-!u2?3T1i>|^`HCaH}G>i7BnNE6#6Pm-E7
zig*};gC6vI5q8~G5T3Iz{{+GNde}+E7@Ocp@Tr6C_&Iz&uh09%`{0*jZ{B8}z0M?0
zX4-Sf^{?J$vjPj`GpFYBje48*TH0Lh4M!VwwB9TZxb1;(Kj>|sNeOmt?~dB#=ysUz
z`^>dD|JTPkf3WzOe_lU+9x3NABHA(PsFT78X#^J<P!@4631boDCi3yM+R<KeuvnSN
zVo9NY>AuX@wzh1H3+1qdN_|`@)NXB8@x_X6YZC{(ks5T1c)Y?(d3Vb%G|%|MrSCpa
zB{3{Q25E>G!`4{|95aAGK#_=m;gQyiL$7{ZOAeQA&dg#0CCC2J=KO_v+%0s5KQyQH
zezj+j-P+v?Rig$A!zn@ySgv;S>p^QZwEu^l!a4sNIDU>B8wo@tm)IF(B_c!<%V_$C
zFp^>lZ3N-t<#i9r3&|AT{o*6cg}}ZT<nohXWf*ijvK6kki=$e;xQ$6k4OLY{#fhv|
z_@EzbTrPuVy!pZMVSC=+yfo`c?bN@SBdjO|T5&^=quQpk)(|^Mjj~WNX_>Lq$GdAO
z{_6zP{x~*^rI4uya3XhMxmTI&0JNevyCjgMD@N3p+hA>4+6OgNZxlu$r$Ja;nOyY?
zOJ|Qx_+MAE{zl_d|L)F-^UzSifU?9nhy->d(kc~=p)?9GqckOiBjsO&qvS^8=hG=#
z5_qIMm*3xOR`qZ<ymC=XC-+!y=W5&{V}qKjoi)|69lX6dDaSD#PyQ>|eS2n+OU4P0
zQiqn3)P0I%Y1uI1T45Xs!5k$FBEPV><L}!~{L@R{B-h=mjQ^+qz26#aCmZpf8UOh>
f=O2z?^7r_stRLK)O~{>>CzIz7+)4lYqi^2>ZKeX5

diff --git a/flake.nix b/flake.nix
index 1cd25684d93e3975cebd1f16fa0aa38db3498ec5..1c7b8f67e29390a6fdbb8dda6b93bf9a583cf7be 100644
GIT binary patch
literal 6830
zcmb_gTW{Mo6n^ioAnZP*=p;AyG(muN&4zVo(xSnD0YOpF5^b@jNP(n$L6HBxLyDvr
zTXyU$1sce_eCIn?^6>r@LZa4HtrfaNl-rLF=pKd<QiP3uvtNZMNm62t$3!+GoX)Gs
zScM;n;7Kk8&D{tQQ(7h?h9{&MQ6!T@yA5fY0`9{(VnjEh>Z%e_ll*p}G${?4yWafl
z<mbsz!YHrjJ=DWkW<~h@<KmUwSrOUnfh|~Tsm|>%LXKg|=rA1<{?W`KwJc{(S%EDR
zqqxxw-~s{}<81K_XA{t0rLXUsJr5U766Nj#H4IQQZ(-gzntgOdM!06$P1+sh<c7|_
z-h!x7<ekKUf>2Js#wpe@mNRU7Y$DGGJXev7V)jv5JsP*RvmmTy1T+k^5xR@M5xS2Z
zo|3ti__ho3;nA*ikcqMstu+w(5iNN8)~e}wSo2ZtV$CZ0N$?RJ*Ai<gxbeWf+diYE
zF_JUaT{_6glx9Q?U;+Zc*aV>=<yv$vvr|4|Okm3?ozi%1;MrokRbj?OaB8VuH#STk
zFA7}51Y+O`e7j~ddc35i&*+pSw1i;nl(5%(eGeQ>5I+no*@5%;fO4fVV?+*mK`=sZ
zQ7_Are46`tYySksO3FbFGb;DqgdO)&ELB>A>L9;oCG;+QC^!>5xVVSeul&jshR4oL
zbC(V_%|i9C*}7&=h=%p?=qSd~n^agAz%w38q2zsoVIMgz-)U)TkWc#{4&o)`+v6JK
z_d^Yx63MW2`CYJ+twF77evMZ>UKf?i)UAuA_Z%~yU;_^|$R*Bdh7(<olC&NQap>KE
zOzJgBAEo;4X&xAWk6O*(M_}9L59anja5GDBF%q(ba&1GXE#Z4V&u!Ig{-&6bUj_yH
zDhg?TTM))fYIW_pcf#7>GOkU_iQN@>v~tB9aAp+Z!z{aqECZF?%MO|$G^V;abee**
zXTfKZYGUzkGf6A`JJhsZIr*$a5AB)5Clfrw`c_NIp&ZBIfo%4mVNF?%UhheQnT^%~
z(OHwZZ~9<cp_XzdPF}!h>w%F46*O%EHnqShRpPTL7V)khZ@PoUDE0u>hQBs}-HpIk
z;y${@pk6a-4FmLC_ITUtMP=$z4~$jR!=Ax1|HO<p_2R}Hd0|+R%G7LAMGQ_fK61lC
zCABGALq^=J59&CjVez&EKvZH5s+v>1hy*r7Vo;cL>>G_u9kf0l3C6_CMBx%~PtBbb
z-K>JlS~3HnRB=8SfW1Dz|CAF(%T&nmz$D22(cwW83W>vfJ}INPzovCF>vWjjKRY@&
zJ_)QNmj$?GQW1Q66I*LF6CbhN(`aQp9w>mB%^q*<KKknFZyb}!3@;dzkBG}tvAH=k
zocBGhW8+Ei+8l>36NESad|yTf-;FVx$KxG@jOr1YV;;;Fd#(Xnk^+Xb7ndl(3xac%
zK{eb#?ynm2k>GkoZ~%juXJ%H0^L&w1tRBN<W(Q6_nN~P~SE0l-uo)9|4o!<RrRJFg
z`{>qPFC!~*+tO?s98YkCD1c@Pk2I7734w2_=CjFO5jD}GifekYsNgcQQ{tE{vvS3@
ze>tS*6EwhMiPbKyE`*d6jth=Ue`Fx!V?O|{a56JS?MKz8RUj@n*!ET1y7S|L)pEr)
zfU!csRhXE88*<xyvFW25du5E>#-mH*4v7H*HXMfzl+$sc*&=Zl&z5)}LC;k}mk+JA
zB*^Ebi5?Cw0I0xIm;y(b_6$o()H5SB6Ir74g2Cy?HHcBo<H8P#uFa|y=vKX5&wVWk
zNfb2~+r-4v&Lmk4uMFxtJhe!;x2=}$WdYBp3L!-2;61?_m%#aDZX??U^%G$OU_dR-
z8MA@%oXnGaxPzQ)n!P`8P;C}RU>L53SpBbp{paU@um3nl&_pQ+VM(ThYc!IgM71&}
zE=YqT!ZpuUDQ;TIZA~?$(5qa3SyiIwFi}b1jc9x9C)@xwH-JlW`Y5?XH*giS?{ogy
z?=oplk$xY2s+9)qeV1fahBqKpBzdA_wgW#|s{&s1reuFbeFqrE8#0$@gqb3bW2eIK
zmRLaprIWD~a9@V@Z9Nf&JKBzt!mbHasvysw2wmV|(I!%2LP{`VCYX@Q_I_$dQdJ>1
zSqyOw@2Wv$;MIX27H!}K{(E#CuGpf42ajSqZiP@L{!IG@c1%Z5(DLSrV0w}uKeTfm
zJ<J69PAp8glHW&#)|F~{oeuDU$7(;40adDohrWZulYsIC14YxpQ4KkZHJS-I@#hL;
zuc3c@mSyipXGi4d_yiB%9q+#z?jPo-!+e<SAD+BFJvuqf@aeF<A8atFs)VMa#jIR!
z!Oq4h$LjADvjng(vqAE>suPGTLU<xcCS(rB%G&%3fUd3d#x@RtH>d2~F&ScbAt(nO
zuwnBCHV{}>&3h9964o6<tedx|^|U%ov-T_oz-_2NbUsV2doK$je6Rvu7~5chv7WrF
mSlyPR4Pt#>yr^ssx{cm*NtCE1ytuz8g%<V+61LTUc=aD(!ke-H

delta 997
zcmaJ=O;6h}7(VQ<rgWvKLkz^2TLFim)N1*r+JVEqBnlGKq+Q*_NlhKQvK?qNp=pzL
z+12MsJMGA}%YFxcWPf3rolsCBMlMn8=Xu`eecvY+o0s4xEG;uK9t}g;iUkGFKr<w2
z5cl^E$@u6Eyt;$>TWR*O#Gb%P8qoVPNS_<Zn*Qvxb<^3>f1J7Hn{z9r+B+Ma%`GeD
za_0Ji6TjKj4F@^^5H^aHZ0RrMwR`8?vc4=o{7|rBc^;3Vm=TpsEV*YWp@<ow)C-Hn
zovg#R#|D`}ja-N#!omV0hyy%E3{KgC8KS9wmzJL9+sWG*@CdsRVkpGIH1%<Mcj{;;
z6A1!}hFC9F7MgkbNsL&)nSuk1eCZ*I(^+)%MP(7@p%GH5y|Lc0J#*=L$oCW1qdfMF
zxX5_hD=fNwC3f`J3i`)`g>*f$)%ufsl|eERXAyj5UfDp+W;*(7_0ehp$Aut$iW!P9
zw4_iVDUJER)tB>m=zc<D0a0jg8_xDR!~B#)ZaR`%<72(%=c*gEdEKp@=<l`F!UC?F
z^0?<pl~7CxQzIH@<vRLcW@RaFh{oO!$z!u7K_q8T|C*`mPt!Zq7q8#-p6>x^wg`Bj
zEA>_}eWzrEMehKz!6a%X9TBFgke<AK`(;5Bj<It$-T<<I?gL=Sg!y>v`u+cot4F-u
VG#L{pQmBvQRhsStVE(4_@;^}CM-%`6

diff --git a/home/theme.nix b/home/theme.nix
index 969968da..25e5c42d 100644
--- a/home/theme.nix
+++ b/home/theme.nix
@@ -46,7 +46,7 @@
 
   xresources.extraConfig =
     builtins.readFile
-    "${pkgs.dracula-theme}/xres/Xresources";
+    "${pkgs.dracula-theme}/xres";
 
   xdg.configFile = let
     qtconf = ''
diff --git a/modules/audio.nix b/modules/audio.nix
index 32e347e3..fe7df897 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -1,7 +1,5 @@
 {nix-gaming, ...}: {
-  imports = [
-    nix-gaming.nixosModules.pipewireLowLatency
-  ];
+  imports = [nix-gaming.nixosModules.pipewireLowLatency];
 
   hardware.pulseaudio.enable = false;
 
diff --git a/updateSha.sh b/updateSha.sh
index 98e4bd40..dbcad4e6 100755
--- a/updateSha.sh
+++ b/updateSha.sh
@@ -21,29 +21,6 @@ parseFetchurl() {
     sed -i "s,sha256 = .*,sha256 = \"$HASH\";," "$FILE"
 }
 
-
-updateOverlays() {
-    FILE="/home/matt/.nix/common/overlays"
-    parseNurl "https://github.com/dasJ/spotifywm" "$FILE/spotifywm/spotifywm.nix"
-}
-
-updateDracula() {
-    FILE="/home/matt/.nix/common/overlays/dracula-theme"
-    parseNurl "https://github.com/matt1432/bat"       "$FILE/bat.nix"
-    parseNurl "https://github.com/dracula/gtk"        "$FILE/default.nix"
-    parseNurl "https://github.com/dracula/plymouth"   "$FILE/plymouth.nix"
-    parseNurl "https://github.com/dracula/git"        "$FILE/git.nix"
-    parseNurl "https://github.com/dracula/xresources" "$FILE/xresources.nix"
-    parseFetchurl "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true" "$FILE/wallpaper.nix"
-}
-
-updateCustomPkgs() {
-    FILE="/home/matt/.nix/common/pkgs"
-    parseNurl "https://github.com/tio/input-emulator" "$FILE/input-emulator/default.nix"
-    parseNurl "https://gitlab.com/mishakmak/pam-fprint-grosshack" "$FILE/pam-fprint-grosshack/default.nix"
-    parseNurl "https://gitlab.com/phoneybadger/pokemon-colorscripts" "$FILE/pokemon-colorscripts/default.nix"
-}
-
 updateFFZ() {
     FILE="/home/matt/.nix/home/firefox/addons/default.nix"
     URL="https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"
@@ -70,43 +47,15 @@ updateFirefoxAddons() {
     mozilla-addons-to-nix addons.json generated-firefox-addons.nix)
 }
 
-updateGSR() {
-    (
-        cd /tmp || return
-
-        if [[ ! -d "gpu-screen-recorder" ]]; then
-            git clone https://repo.dec05eba.com/gpu-screen-recorder
-            cd gpu-screen-recorder || return
-        else
-            cd gpu-screen-recorder || return
-            git pull
-        fi
-
-        REV=$(printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
-        URL=https://dec05eba.com/snapshot/gpu-screen-recorder.git."$REV".tar.gz
-        FILE="/home/matt/.nix/devices/binto/modules/gpu-replay.nix"
-
-        parseFetchurl "$URL" "$FILE"
-    )
-}
-
 
 doAll() {
     updateFFZ
-    updateCustomPkgs
-    updateOverlays
-    updateDracula
     updateFirefoxAddons
-    updateGSR
 }
 
 
 [[ "$1" == "-a" || "$1" == "--all" ]] && doAll
-[[ "$1" == "-d" || "$1" == "--dracula" ]] && updateDracula
-[[ "$1" == "-c" || "$1" == "--custom" ]] && updateCustomPkgs
-[[ "$1" == "-o" || "$1" == "--overlays" ]] && updateOverlays
 [[ "$1" == "-f" || "$1" == "--firefox" ]] && updateFirefoxAddons
 [[ "$1" == "-ffz" || "$1" == "--frankerfacez" ]] && updateFFZ
-[[ "$1" == "-gsr" || "$1" == "--gpu-screen-recorder" ]] && updateGSR
 
 alejandra /home/matt/.nix