2023-12-10

1 files changed, 46 insertions, 33 deletions

diff --git a/overlay.nix b/overlay.nix
index 1cc33a1..c8fed1f 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,28 +1,23 @@
 final: prev: {
+  alejandra = prev.alejandra.overrideAttrs (_: super: {
+    patches =
+      (super.patches or [])
+      ++ [
+        ./patches/alejandra-no-noise.patch
+      ];
+  });
+
   bruh = prev.callPackage ./packages/bruh.nix {};
 
   emacsql-sqlite = prev.callPackage ./packages/emacsql-sqlite.nix {};
 
-  hiccup = prev.callPackage ./packages/hiccup.nix {};
-
-  myip = prev.callPackage ./packages/myip.nix {};
-
-  nixfiles = prev.callPackage ./packages/nixfiles.nix {};
-
-  openssl_1_0_0 = prev.callPackage ./packages/openssl_1_0_0.nix {};
-
-  parinfer-rust = prev.callPackage ./packages/parinfer-rust.nix {};
-
-  logcli = prev.grafana-loki.overrideAttrs (_: super: {
-    pname = "logcli";
-    subPackages = ["cmd/logcli"];
-    nativeBuildInputs = super.nativeBuildInputs ++ [final.installShellFiles];
-    postInstall = ''
-      installShellCompletion --cmd logcli \
-        --bash <($out/bin/logcli --completion--script-bash) \
-        --zsh <($out/bin/logcli --completion-script-zsh)
-    '';
-    preFixup = null;
+  git-extras = prev.git-extras.overrideAttrs (_: super: {
+    postPatch =
+      (super.postPatch or "")
+      + ''
+        substituteInPlace bin/git-setup \
+          --replace 'Initial commit' 'chore: init'
+      '';
   });
 
   grc = prev.grc.overrideAttrs (_: super: {
@@ -43,14 +38,30 @@ final: prev: {
       ];
   });
 
-  alejandra = prev.alejandra.overrideAttrs (_: super: {
-    patches =
-      (super.patches or [])
-      ++ [
-        ./patches/alejandra-no-noise.patch
-      ];
+  hiccup = prev.callPackage ./packages/hiccup.nix {};
+
+  logcli = prev.grafana-loki.overrideAttrs (_: super: {
+    pname = "logcli";
+    subPackages = ["cmd/logcli"];
+    nativeBuildInputs = super.nativeBuildInputs ++ [final.installShellFiles];
+    postInstall =
+      (super.postInstall or "")
+      + ''
+        installShellCompletion --cmd logcli \
+          --bash <($out/bin/logcli --completion--script-bash) \
+          --zsh <($out/bin/logcli --completion-script-zsh)
+      '';
+    preFixup = null;
   });
 
+  myip = prev.callPackage ./packages/myip.nix {};
+
+  nixfiles = prev.callPackage ./packages/nixfiles.nix {};
+
+  openssl_1_0_0 = prev.callPackage ./packages/openssl_1_0_0.nix {};
+
+  parinfer-rust = prev.callPackage ./packages/parinfer-rust.nix {};
+
   prismlauncher-unwrapped =
     (prev.prismlauncher-unwrapped.override (finalAttrs: {
       stdenv = final.useMoldLinker finalAttrs.stdenv;
@@ -78,12 +89,14 @@ final: prev: {
   vesktop = prev.vesktop.overrideAttrs (_: super: {
     nativeBuildInputs = super.nativeBuildInputs ++ [final.imagemagick];
     patches = (super.patches or []) ++ [./patches/vesktop-no-anime.patch];
-    postInstall = ''
-      rm -rf $out/share/icons/hicolor/*
-      for size in 16 24 32 48 64 96; do
-        convert -scale $size icon.png $size.png
-        install -Dm644 $size.png $out/share/icons/hicolor/''${size}x''${size}/apps/vencorddesktop.png
-      done
-    '';
+    postInstall =
+      (super.postInstall or "")
+      + ''
+        rm -rf $out/share/icons/hicolor/*
+        for size in 16 24 32 48 64 96; do
+          convert -scale $size icon.png $size.png
+          install -Dm644 $size.png $out/share/icons/hicolor/''${size}x''${size}/apps/vencorddesktop.png
+        done
+      '';
   });
 }