updte

homes/x86_64-linux/marshall@navis/default.nix

@@ -4,82 +4,7 @@
   inputs,
   ...
 }: let
-  equibop = with pkgs; (vesktop.overrideAttrs (final: prev: rec {
-    pname = "Equibop";
-    version = "2.0.9";
-
-    src = fetchFromGitHub {
-      owner = "Equicord";
-      repo = "equibop";
-      rev = "v${version}";
-      hash = "sha256-imRqr6Gd29t/zFcH73JRJIMozEhig1lHXLyefgB74yM=";
-    };
-
-    pnpmDeps = pnpm_9.fetchDeps {
-      inherit
-        (final)
-        pname
-        version
-        src
-        ;
-      inherit (prev) patches;
-      hash = "sha256-YaZA1Oz9lJcEm9Ihx37Iooc7l6Zsy65kYAK2KWffh/c=";
-    };
-
-    installPhase =
-      ''
-        runHook preInstall
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        mkdir -p $out/opt/Equibop
-        cp -r dist/*unpacked/resources $out/opt/Equibop/
-
-        for file in build/icon_*x32.png; do
-          file_suffix=''${file//build\/icon_}
-          install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/equibop.png
-        done
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        mkdir -p $out/{Applications,bin}
-        mv dist/mac*/Equibop.App $out/Applications
-      ''
-      + ''
-        runHook postInstall
-      '';
-
-    postFixup =
-      lib.optionalString stdenv.hostPlatform.isLinux ''
-        makeWrapper ${electron}/bin/electron $out/bin/equibop \
-          --add-flags $out/opt/Equibop/resources/app.asar \
-          --add-flags \"--enable-speech-dispatcher\" \
-          --add-flags \"--enable-blink-features=MiddleClickAutoscroll\" \
-          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
-      ''
-      + lib.optionalString stdenv.hostPlatform.isDarwin ''
-        makeWrapper $out/Applications/equicord.app/Contents/MacOS/Equibop $out/bin/equibop
-      '';
-
-    desktopItems = lib.optional stdenv.hostPlatform.isLinux (makeDesktopItem {
-      name = "equibop";
-      desktopName = "Equibop";
-      exec = "equibop %U";
-      icon = "equibop";
-      startupWMClass = "Equibop";
-      genericName = "Internet Messenger";
-      keywords = [
-        "discord"
-        "vencord"
-        "electron"
-        "chat"
-        "equicord"
-      ];
-      categories = [
-        "Network"
-        "InstantMessaging"
-        "Chat"
-      ];
-    });
-  }));
+  sources = import ../../../_sources/generated.nix {inherit (pkgs) fetchFromGitHub;};
 in {
   imports = with inputs; [
     catppuccin.homeManagerModules.catppuccin
@@ -106,7 +31,10 @@ in {
         beeper
         duf
         eternal-terminal
-        emacs30-pgtk
+        ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs:
+          builtins.attrValues {
+            inherit (epkgs.treesit-grammars) with-all-grammars;
+          }))
         emacs-lsp-booster
         equibop
         glow
@@ -157,6 +85,7 @@ in {
       ++ (with jetbrains; [
         clion
         rust-rover
+        phpstorm
         webstorm
         idea-ultimate
       ])