belghg;

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

@@ -3,7 +3,84 @@
   pkgs,
   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"
+      ];
+    });
+  }));
+in {
   imports = with inputs; [
     catppuccin.homeManagerModules.catppuccin
     chaotic.homeManagerModules.default
@@ -29,6 +106,7 @@
         beeper
         duf
         eternal-terminal
+        equibop
         glow
         grc
         jamesdsp
@@ -44,7 +122,6 @@
         slack
         telegram-desktop
         xdotool
-        zed-editor
         (xwinwrap.overrideAttrs {
           src = fetchFromGitHub {
             owner = "camonater62";
@@ -62,16 +139,8 @@
             mv xwinwrap $out/bin
           '';
         })
-        vesktop
         youki
-        (pkgs.buildFHSUserEnv {
-          name = "zed";
-          targetPkgs = pkgs:
-            with pkgs; [
-              zed-editor
-            ];
-          runScript = "zed";
-        })
+        zed-editor
       ]
       ++ (with jetbrains; [
         clion
@@ -80,12 +149,10 @@
         idea-ultimate
       ])
       ++ (with inputs; [
+        cider.packages.${pkgs.system}.default
         nixvim.packages.${pkgs.system}.default
         zen-browser.packages.${pkgs.system}.specific
-      ])
-      ++ (with inputs.chaotic.packages.${pkgs.system}; [
-        distrobox_git
-        firefox_nightly
+        chaotic.packages.${pkgs.system}.distrobox_git
       ]);
 
     stateVersion = "24.05";

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

@@ -11,7 +11,7 @@ with pkgs; {
   ];
 
   wayland.windowManager.hyprland = {
-    enable = true;
+    enable = false;
     systemd.variables = ["--all"];
 
     settings = let

homes/x86_64-linux/marshall@navis/hyprland/services.nix

@@ -1,7 +1,7 @@
 {...}: {
   services = {
     cliphist.enable = true;
-    udiskie.enable = true;
+    udiskie.enable = false;
 
     swaync = {
       enable = true;

homes/x86_64-linux/marshall@navis/hyprland/waybar.nix

@@ -8,7 +8,7 @@
   betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
 in {
   programs.waybar = {
-    enable = true;
+    enable = false;
     package = pkgs.waybar;
     settings = [
       {