2024-03-31

1 files changed, 69 insertions, 77 deletions

diff --git a/overlay.nix b/overlay.nix
index 0a883f5..fb5ab8c 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,102 +1,94 @@
 final: prev: {
-  alejandra = prev.alejandra.overrideAttrs (_: super: {
-    patches =
-      (super.patches or [])
-      ++ [
-        ./patches/alejandra-no-noise.patch
-      ];
-  });
-
-  bruh = prev.callPackage ./packages/bruh.nix {};
+  bruh = prev.callPackage ./packages/bruh.nix { };
 
-  emacsql-sqlite = prev.callPackage ./packages/emacsql-sqlite.nix {};
+  emacsql-sqlite = prev.callPackage ./packages/emacsql-sqlite.nix { };
 
-  git-extras = prev.git-extras.overrideAttrs (_: super: {
-    postPatch =
-      (super.postPatch or "")
-      + ''
-        substituteInPlace bin/git-setup \
-          --replace 'Initial commit' 'chore: init'
-      '';
-  });
+  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: {
-    version = "unstable-2021-08-12";
-    src = final.fetchFromGitHub {
-      owner = "garabik";
-      repo = "grc";
-      rev = "4d6a51fd78ad7e19af8dd12b2a828d1807267079";
-      hash = "sha256-SmOZrgV0lgLryFoxADU15IKJ7jhxXar0MgbsV/z1GaE=";
-    };
-    patches =
-      (super.patches or [])
-      ++ [
+  grc = prev.grc.overrideAttrs (
+    _: super: {
+      version = "unstable-2021-08-12";
+      src = final.fetchFromGitHub {
+        owner = "garabik";
+        repo = "grc";
+        rev = "4d6a51fd78ad7e19af8dd12b2a828d1807267079";
+        hash = "sha256-SmOZrgV0lgLryFoxADU15IKJ7jhxXar0MgbsV/z1GaE=";
+      };
+      patches = (super.patches or [ ]) ++ [
         (final.fetchpatch {
           url = "https://patch-diff.githubusercontent.com/raw/garabik/grc/pull/214.patch";
           hash = "sha256-VNr9jl5oFbFNJbGsjflwFV3oTbCzJ0lBIZA4eyeoXLY=";
         })
       ];
-  });
+    }
+  );
+
+  hiccup = prev.callPackage ./packages/hiccup.nix { };
 
-  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;
+    }
+  );
 
-  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 { };
 
-  myip = prev.callPackage ./packages/myip.nix {};
+  nixfiles = prev.callPackage ./packages/nixfiles.nix { };
 
-  nixfiles = prev.callPackage ./packages/nixfiles.nix {};
+  nixfmt = prev.nixfmt-rfc-style;
 
-  openssl_1_0_0 = prev.callPackage ./packages/openssl_1_0_0.nix {};
+  openssl_1_0_0 = prev.callPackage ./packages/openssl_1_0_0.nix { };
 
-  parinfer-rust = prev.callPackage ./packages/parinfer-rust.nix {};
+  parinfer-rust = prev.callPackage ./packages/parinfer-rust.nix { };
 
   prismlauncher-unwrapped =
     (prev.prismlauncher-unwrapped.override (finalAttrs: {
       stdenv = final.useMoldLinker finalAttrs.stdenv;
-    }))
-    .overrideAttrs (_: super: {
-      patches =
-        (super.patches or [])
-        ++ [
-          ./patches/prismlauncher-allow-offline-accounts.patch
-        ];
-    });
+    })).overrideAttrs
+      (
+        _: super: {
+          patches = (super.patches or [ ]) ++ [ ./patches/prismlauncher-allow-offline-accounts.patch ];
+        }
+      );
 
   telegram-desktop =
     (prev.telegram-desktop.override (finalAttrs: {
       stdenv = final.useMoldLinker finalAttrs.stdenv;
-    }))
-    .overrideAttrs (_: super: {
-      patches =
-        (super.patches or [])
-        ++ [
-          ./patches/telegram-desktop-no-ads.patch
-        ];
-    });
+    })).overrideAttrs
+      (_: super: { patches = (super.patches or [ ]) ++ [ ./patches/telegram-desktop-no-ads.patch ]; });
 
-  vesktop = prev.vesktop.overrideAttrs (_: super: {
-    nativeBuildInputs = super.nativeBuildInputs ++ [final.imagemagick];
-    patches = (super.patches or []) ++ [./patches/vesktop-no-anime.patch];
-    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/vesktop.png
-        done
-      '';
-  });
+  vesktop = prev.vesktop.overrideAttrs (
+    _: super: {
+      nativeBuildInputs = super.nativeBuildInputs ++ [ final.imagemagick ];
+      patches = (super.patches or [ ]) ++ [ ./patches/vesktop-no-anime.patch ];
+      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/vesktop.png
+          done
+        '';
+    }
+  );
 }