From 2a6d53d14ad0b2db10dca69b182d44397870912f Mon Sep 17 00:00:00 2001
From: Chris Toph <toph@ryot.foo>
Date: Wed, 12 Mar 2025 13:32:51 -0400
Subject: [PATCH] Update overlay directory paths

---
 flake.nix                               |  2 +-
 pkgs/common/fleet/package.nix           | 31 ++++++++++++++
 pkgs/common/snapraid-runner/default.nix | 55 ------------------------
 pkgs/common/snapraid-runner/package.nix | 57 +++++++++++++++++++++++++
 4 files changed, 89 insertions(+), 56 deletions(-)
 create mode 100644 pkgs/common/fleet/package.nix
 delete mode 100644 pkgs/common/snapraid-runner/default.nix
 create mode 100644 pkgs/common/snapraid-runner/package.nix

diff --git a/flake.nix b/flake.nix
index a66235b..441b485 100644
--- a/flake.nix
+++ b/flake.nix
@@ -105,7 +105,7 @@
         in
         lib.packagesFromDirectoryRecursive {
           callPackage = lib.callPackageWith pkgs;
-          directory = ./pkgs/common;
+          directory = pkgs/common;
         }
       );
     };
diff --git a/pkgs/common/fleet/package.nix b/pkgs/common/fleet/package.nix
new file mode 100644
index 0000000..d388efa
--- /dev/null
+++ b/pkgs/common/fleet/package.nix
@@ -0,0 +1,31 @@
+{ pkgs, lib, ... }:
+
+# TODO: not really working, might just remove
+
+let
+  pname = "fleet";
+  version = "1.46.97";
+
+  src = pkgs.fetchurl {
+    url = "https://download-cdn.jetbrains.com/fleet/installers/linux_x64/Fleet-${version}.tar.gz";
+    sha256 = "a7b66f9faff74f2b8b0143bc588a990304dd8efd3ea20fd8d2754cb064a993f3";
+  };
+
+  appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; };
+in
+pkgs.appimageTools.wrapType2 rec {
+  inherit pname version src;
+
+  extraInstallCommands = ''
+    mv $out/bin/${pname} $out/bin/${pname}
+    install -m 444 -D ${appimageContents}/lib/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
+  '';
+  # install -m 444 -D ${appimageContents}/ubports-installer.desktop $out/share/applications/${pname}.desktop
+  # substituteInPlace $out/share/applications/${pname}.desktop \
+  # --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
+
+  meta = with lib; {
+    description = "Jetbrains Fleet";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/common/snapraid-runner/default.nix b/pkgs/common/snapraid-runner/default.nix
deleted file mode 100644
index e4c9774..0000000
--- a/pkgs/common/snapraid-runner/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  snapraid-runner-py = pkgs.writeTextFile {
-    name = "snapraid-runner.py";
-    executable = true;
-    destination = "/bin/snapraid-runner.py";
-    text = builtins.readFile ./snapraid-runner.py;
-  };
-
-  snapraid-runner = pkgs.writeTextFile {
-    name = "snapraid-runner.sh";
-    executable = true;
-    destination = "/bin/snapraid-runner";
-    text = ''#!${pkgs.stdenv.shell}
-
-# Check if the "-c" option is present
-config_option_present=false
-for arg in "$@"; do
-  if [ "$arg" = "-c" ]; then
-    config_option_present=true
-    break
-  fi
-done
-
-# Add the default config option if not present
-if [ "$config_option_present" = false ]; then
-  set -- "-c" "/etc/snapraid-runner.conf" "$@"
-fi
-
-${pkgs.python311}/bin/python3 ${snapraid-runner-py}/bin/snapraid-runner.py "$@"
-'';
-  };
-
-in
-stdenv.mkDerivation rec {
-  pname = "snapraid-runner";
-  version = "8f78f9f1af8ca5a9b6469a6c142cab2577157331";
-
-  buildInputs = [
-    snapraid-runner
-  ];
-
-  builder = pkgs.writeTextFile {
-    name = "builder.sh";
-    text = ''. $stdenv/setup
-mkdir -p $out/bin
-ln -sf ${snapraid-runner}/bin/snapraid-runner $out/bin/snapraid-runner'';
-  }; 
-}
\ No newline at end of file
diff --git a/pkgs/common/snapraid-runner/package.nix b/pkgs/common/snapraid-runner/package.nix
new file mode 100644
index 0000000..804d190
--- /dev/null
+++ b/pkgs/common/snapraid-runner/package.nix
@@ -0,0 +1,57 @@
+{
+  stdenv,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  snapraid-runner-py = pkgs.writeTextFile {
+    name = "snapraid-runner.py";
+    executable = true;
+    destination = "/bin/snapraid-runner.py";
+    text = builtins.readFile ./snapraid-runner.py;
+  };
+
+  snapraid-runner = pkgs.writeTextFile {
+    name = "snapraid-runner.sh";
+    executable = true;
+    destination = "/bin/snapraid-runner";
+    text = ''
+      #!${pkgs.stdenv.shell}
+
+      # Check if the "-c" option is present
+      config_option_present=false
+      for arg in "$@"; do
+        if [ "$arg" = "-c" ]; then
+          config_option_present=true
+          break
+        fi
+      done
+
+      # Add the default config option if not present
+      if [ "$config_option_present" = false ]; then
+        set -- "-c" "/etc/snapraid-runner.conf" "$@"
+      fi
+
+      ${pkgs.python311}/bin/python3 ${snapraid-runner-py}/bin/snapraid-runner.py "$@"
+    '';
+  };
+
+in
+stdenv.mkDerivation rec {
+  pname = "snapraid-runner";
+  version = "8f78f9f1af8ca5a9b6469a6c142cab2577157331";
+
+  buildInputs = [
+    snapraid-runner
+  ];
+
+  builder = pkgs.writeTextFile {
+    name = "builder.sh";
+    text = ''
+      . $stdenv/setup
+      mkdir -p $out/bin
+      ln -sf ${snapraid-runner}/bin/snapraid-runner $out/bin/snapraid-runner'';
+  };
+}