From bbf0d97deb136ec88054bcdb2a5884d2844a213a Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Mon, 15 Jul 2024 12:01:40 -0300
Subject: [PATCH] Some packages

---
 hosts/common/packages.nix          |  2 --
 hosts/desktops/common/packages.nix | 27 +++++++++++++++++++++
 users/common/programs.nix          | 39 ------------------------------
 users/desktops/common/programs.nix |  5 ++--
 4 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index d6767a4..d2e330b 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -10,10 +10,8 @@
     git
     helix
     neofetch
-    # nix-your-shell # Currently only available in unstable
     sysz
     tmux
-    toolbox
     tree
     wget
   ];
diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index 0e89cc3..76e0eda 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -65,6 +65,33 @@ in {
       virt-manager
       yad
       wezterm
+      zed-editor
+      (appimageTools.wrapType2 rec {
+        pname = "ondsel-es";
+        version = "2024.2.2";
+
+        src = fetchurl {
+          url =
+            "https://github.com/Ondsel-Development/FreeCAD/releases/download/2024.2.2/Ondsel_ES_2024.2.2.37240-Linux-x86_64.AppImage";
+          hash = "sha256-UrCftzDV4HJWOK4QxFKZUOZ/dJquiLu/e9WTfdo1Sh0=";
+        };
+
+        extraInstallCommands = let
+          appimageContents =
+            appimageTools.extractType2 { inherit pname version src; };
+        in ''
+          install -Dm444 ${appimageContents}/com.ondsel.ES.desktop -t $out/share/applications/
+          install -Dm444 ${appimageContents}/Ondsel.svg -t $out/share/pixmaps/
+        '';
+
+        extraPkgs = pkgs: [ pkgs.python313 ];
+
+        meta = with lib; {
+          homepage = "https://www.ondsel.com";
+          license = licenses.lgpl2Plus;
+          platforms = platforms.linux;
+        };
+      })
     ] ++ kdepkgs;
 
   programs = {
diff --git a/users/common/programs.nix b/users/common/programs.nix
index 2dc4000..82d36e5 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -9,11 +9,6 @@
       historyFile = "~/.cache/bash_history";
     };
 
-    nix-index = {
-      enable = true;
-      enableFishIntegration = true;
-    };
-
     helix = {
       enable = true;
       settings = {
@@ -38,40 +33,6 @@
           esc = [ "collapse_selection" "keep_primary_selection" ];
         };
       };
-      languages = {
-        language = [
-          {
-            name = "nix";
-            # scope = "source.nix";
-            auto-format = true;
-            formatter.command = "nixfmt";
-          }
-          {
-            name = "typst";
-            scope = "source.typ";
-            file-types = [ "typ" ];
-            roots = [ ];
-            injection-regex = "^typst$";
-            auto-format = true;
-            comment-token = "//";
-            indent = {
-              tab-width = 2;
-              unit = " ";
-            };
-            formatter = {
-              command = "prettypst";
-              args = [ "--use-std-in" "--use-std-out" ];
-            };
-          }
-        ];
-        grammar = [{
-          name = "typst";
-          source = {
-            git = "https://github.com/SeniorMars/tree-sitter-typst";
-            rev = "2e66ef4b798a26f0b82144143711f3f7a9e8ea35";
-          };
-        }];
-      };
       themes.catppuccin-mocha_transparent = {
         inherits = "catppuccin_mocha";
         "ui.background" = "{}";
diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix
index 1246140..d965b20 100644
--- a/users/desktops/common/programs.nix
+++ b/users/desktops/common/programs.nix
@@ -67,7 +67,6 @@
       frame_timing
       battery_icon
       gamepad_battery_icon
-      #media_player
 
       horizontal
       horizontal_stretch=0
@@ -80,8 +79,6 @@
       table_columns=20
       time_format=%H:%M
       toggle_hud=End
-      #media_player_format={title} - {artist}
-      #font_scale_media_player=1
 
       core_load_change
       cpu_color=ffffff
@@ -103,6 +100,8 @@
       vram_color=ffffff
       engine_color=ffffff
       frametime_color=ffffff
+
+      blacklist=zed
     '';
     ".mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json".source =
       "${pkgs.plasma-browser-integration}/lib/mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json";