From a8bb6d4bcd8f03fabc307953a4afb5045032629c Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Thu, 2 Jan 2025 22:11:40 -0300
Subject: [PATCH] some commonly broken packages are now flatpak

---
 flake.nix                          |  6 -----
 hosts/desktops/common/packages.nix | 18 +++++++-------
 hosts/desktops/io.nix              |  1 -
 hosts/desktops/rotterdam.nix       |  2 +-
 packages/chromeos-ectool.nix       | 34 --------------------------
 packages/creality-print.nix        | 38 ------------------------------
 6 files changed, 9 insertions(+), 90 deletions(-)
 delete mode 100644 packages/chromeos-ectool.nix
 delete mode 100644 packages/creality-print.nix

diff --git a/flake.nix b/flake.nix
index d1328c6..81e961a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -139,13 +139,7 @@
 
       overlays = {
         custom = final: prev: {
-          chromeos-ectool =
-            nixpkgs.legacyPackages."x86_64-linux".callPackage ./packages/chromeos-ectool.nix
-              { };
           plasticity = nixpkgs.legacyPackages."x86_64-linux".callPackage ./packages/plasticity.nix { };
-          creality-print =
-            nixpkgs.legacyPackages."x86_64-linux".callPackage ./packages/creality-print.nix
-              { };
         };
       };
 
diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index 3e82137..772e0a8 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -19,7 +19,6 @@ in
       aspellDicts.pt_BR
       bat
       clonehero
-      creality-print
       deploy-rs
       distrobox
       exhibit
@@ -28,8 +27,6 @@ in
       firefox
       fzf
       gimp
-      heroic
-      itch
       inkscape
       junction
       kde-rounded-corners
@@ -45,22 +42,18 @@ in
       nixfmt-rfc-style
       nix-init
       nix-output-monitor
-      obsidian
       obs-studio
       ocs-url
-      orca-slicer
+      # orca-slicer BROKEN
       openscad
       p7zip
       plasticity
-      prismlauncher
       protonup
-      # quickgui
-      qbittorrent
+      # quickgui BROKEN
       qview
       ripgrep
       rnote
       solvespace
-      space-cadet-pinball
       sparrow
       steam-run
       tor-browser
@@ -75,9 +68,14 @@ in
   services.flatpak = {
     enable = true;
     packages = [
+      "com.github.k4zmu2a.spacecadetpinball"
+      "com.heroicgameslauncher.hgl"
+      "com.modrinth.ModrinthApp"
       "com.steamgriddb.SGDBoop"
+      "io.github.giantpinkrobots.varia"
       "io.github.zen_browser.zen"
-      "org.gtk.Gtk3theme.adw-gtk3-dark"
+      "io.itch.itch"
+      "md.obsidian.Obsidian"
     ];
     uninstallUnmanaged = true;
     update.auto.enable = true;
diff --git a/hosts/desktops/io.nix b/hosts/desktops/io.nix
index 57322cc..1839968 100644
--- a/hosts/desktops/io.nix
+++ b/hosts/desktops/io.nix
@@ -51,7 +51,6 @@ in
     systemPackages = with pkgs; [
       maliit-keyboard
       sof-firmware
-      chromeos-ectool
     ];
     sessionVariables.ALSA_CONFIG_UCM2 = "${cml-ucm-conf}/share/alsa/ucm2";
   };
diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix
index c0697d2..87f51fe 100644
--- a/hosts/desktops/rotterdam.nix
+++ b/hosts/desktops/rotterdam.nix
@@ -56,7 +56,7 @@ in
 
   environment.systemPackages = with pkgs; [ reboot-into-qubes ];
 
-  hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
+  # hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
 
   systemd.targets.hibernate.enable = false; # disable non-functional hibernate
 
diff --git a/packages/chromeos-ectool.nix b/packages/chromeos-ectool.nix
deleted file mode 100644
index 7789551..0000000
--- a/packages/chromeos-ectool.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, lib }:
-
-pkgs.stdenv.mkDerivation {
-  name = "cros-ectool";
-
-  nativeBuildInputs = with pkgs; [
-    cmake
-    ninja
-    pkg-config
-    libusb1
-    libftdi1
-  ];
-
-  src = pkgs.fetchFromGitLab {
-    domain = "gitlab.howett.net";
-    owner = "DHowett";
-    repo = "ectool";
-    rev = "39d64fb0e79e874cfe9877af69158fc2520b1a80";
-    hash = "sha256-SHRnyqicFlviBDu3aH+uKVUstVxpIhZV6JSuZOgOwXU=";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp src/ectool $out/bin/ectool
-  '';
-
-  meta = with lib; {
-    description = "ectool for ChromeOS devices";
-    homepage = "https://gitlab.howett.net/DHowett/ectool";
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    mainProgram = "ectool";
-  };
-}
diff --git a/packages/creality-print.nix b/packages/creality-print.nix
deleted file mode 100644
index 9efdf5f..0000000
--- a/packages/creality-print.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  fetchurl,
-  makeDesktopItem,
-  appimageTools,
-}:
-let
-  releaseNotesVersion = "5.1.6";
-in
-appimageTools.wrapType2 rec {
-  pname = "creality-print";
-  version = "5.1.6";
-
-  src = fetchurl {
-    url = "https://github.com/CrealityOfficial/CrealityPrint/releases/download/v5.1.6/Creality_Print-v5.1.6.10470-x86_64-Release.AppImage";
-    hash = "sha256-gS7b41UEvjwUWjCAWjJbD5Xz8QblZkT6tv5ceRhjYfI=";
-  };
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "creality-print";
-      exec = "creality-print";
-      terminal = false;
-      desktopName = "Creality Print";
-      comment = meta.description;
-      categories = [ "Graphics" ];
-    })
-  ];
-
-  meta = with lib; {
-    description = "Creality 3D Printing Slicing Software";
-    homepage = "https://www.creality.com";
-    changelog = "https://github.com/CrealityOfficial/CrealityPrint/releases/tag/v${releaseNotesVersion}";
-    license = licenses.agpl3Only;
-    platforms = platforms.linux;
-    mainProgram = "creality-print";
-  };
-}