From 8ade39d224483dca15388378ea1d7c1f80f4d301 Mon Sep 17 00:00:00 2001
From: Daniel Cox <63171098+dan-kc@users.noreply.github.com>
Date: Sun, 29 Jun 2025 11:58:51 +0100
Subject: [PATCH 1/4] sunsama: init at 3.1.1

maintainers: add dan-kc

desc update
---
 maintainers/maintainer-list.nix     |  6 +++++
 pkgs/by-name/su/sunsama/package.nix | 34 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/su/sunsama/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 835ec2814e89..641dd64d5272 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5494,6 +5494,12 @@
     githubId = 217543;
     name = "Damien Cassou";
   };
+  dan-kc = {
+    email = "daniel@keone.dev";
+    github = "dan-kc";
+    githubId = 63171098;
+    name = "Daniel Cox";
+  };
   dan-theriault = {
     email = "nix@theriault.codes";
     github = "Dan-Theriault";
diff --git a/pkgs/by-name/su/sunsama/package.nix b/pkgs/by-name/su/sunsama/package.nix
new file mode 100644
index 000000000000..80d39304da36
--- /dev/null
+++ b/pkgs/by-name/su/sunsama/package.nix
@@ -0,0 +1,34 @@
+{
+  appimageTools,
+  lib,
+  fetchurl,
+}:
+
+let
+  version = "3.1.1";
+  pname = "sunsama";
+  src = fetchurl {
+    url = "https://download.todesktop.com/2003096gmmnl0g1/sunsama-${version}-build-250512vfxlcgvds-x86_64.AppImage";
+    sha512 = "VOzD/kWfsP2GR1uYkVUdjAuw9tlKjHRNxYuDSYYH7fn43Bk+wfgom/ofu3it/vQjjtuezkTN6gi96U87ypQrSA==";
+  };
+  appimageContents = appimageTools.extractType2 { inherit pname version src; };
+in
+
+appimageTools.wrapType2 {
+  inherit pname version src;
+  extraInstallCommands = ''
+    install -Dm444 ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/${pname}.png $out/share/pixmaps/${pname}.png
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
+  '';
+
+  meta = with lib; {
+    description = "The digital daily planner that helps you feel calm and stay focused.";
+    homepage = "https://sunsama.com";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ dan-kc ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "sunsama";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20f87db9d05..7b6928681ce1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4474,6 +4474,8 @@ with pkgs;
 
   subzerod = with python3Packages; toPythonApplication subzerod;
 
+  sunsama = callPackage ../by-name/su/sunsama/package.nix { };
+
   system-config-printer = callPackage ../tools/misc/system-config-printer {
     autoreconfHook = buildPackages.autoreconfHook269;
     libxml2 = libxml2Python;

From e8b66b8e954fce2ba3b2040c51bae26fec696c0e Mon Sep 17 00:00:00 2001
From: Daniel Cox <63171098+dan-kc@users.noreply.github.com>
Date: Sun, 29 Jun 2025 19:50:06 +0100
Subject: [PATCH 2/4] remove unnecessary definition

---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b6928681ce1..b20f87db9d05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4474,8 +4474,6 @@ with pkgs;
 
   subzerod = with python3Packages; toPythonApplication subzerod;
 
-  sunsama = callPackage ../by-name/su/sunsama/package.nix { };
-
   system-config-printer = callPackage ../tools/misc/system-config-printer {
     autoreconfHook = buildPackages.autoreconfHook269;
     libxml2 = libxml2Python;

From 49c98157764ad8543702e0ea80d39751a8db74f9 Mon Sep 17 00:00:00 2001
From: Daniel Cox <63171098+dan-kc@users.noreply.github.com>
Date: Sat, 5 Jul 2025 09:29:30 +0100
Subject: [PATCH 3/4] refactor

---
 pkgs/by-name/su/sunsama/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/su/sunsama/package.nix b/pkgs/by-name/su/sunsama/package.nix
index 80d39304da36..cb4696735d07 100644
--- a/pkgs/by-name/su/sunsama/package.nix
+++ b/pkgs/by-name/su/sunsama/package.nix
@@ -9,7 +9,7 @@ let
   pname = "sunsama";
   src = fetchurl {
     url = "https://download.todesktop.com/2003096gmmnl0g1/sunsama-${version}-build-250512vfxlcgvds-x86_64.AppImage";
-    sha512 = "VOzD/kWfsP2GR1uYkVUdjAuw9tlKjHRNxYuDSYYH7fn43Bk+wfgom/ofu3it/vQjjtuezkTN6gi96U87ypQrSA==";
+    hash = "sha512-VOzD/kWfsP2GR1uYkVUdjAuw9tlKjHRNxYuDSYYH7fn43Bk+wfgom/ofu3it/vQjjtuezkTN6gi96U87ypQrSA==";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
@@ -17,17 +17,17 @@ in
 appimageTools.wrapType2 {
   inherit pname version src;
   extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
-    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/${pname}.png $out/share/pixmaps/${pname}.png
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
+    install -Dm444 ${appimageContents}/sunsama.desktop $out/share/applications/sunsama.desktop
+    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/sunsama.png $out/share/pixmaps/sunsama.png
+    substituteInPlace $out/share/applications/sunsama.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=sunsama'
   '';
 
-  meta = with lib; {
-    description = "The digital daily planner that helps you feel calm and stay focused.";
+  meta = {
+    description = "Digital daily planner that helps you feel calm and stay focused";
     homepage = "https://sunsama.com";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ dan-kc ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ dan-kc ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "sunsama";
   };

From 2bf668936b19fdd1986d837c787b00eca790e210 Mon Sep 17 00:00:00 2001
From: Daniel Cox <63171098+dan-kc@users.noreply.github.com>
Date: Sat, 5 Jul 2025 10:55:34 +0100
Subject: [PATCH 4/4] align with freedesktop.org spec

---
 pkgs/by-name/su/sunsama/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/sunsama/package.nix b/pkgs/by-name/su/sunsama/package.nix
index cb4696735d07..07b202838360 100644
--- a/pkgs/by-name/su/sunsama/package.nix
+++ b/pkgs/by-name/su/sunsama/package.nix
@@ -18,7 +18,7 @@ appimageTools.wrapType2 {
   inherit pname version src;
   extraInstallCommands = ''
     install -Dm444 ${appimageContents}/sunsama.desktop $out/share/applications/sunsama.desktop
-    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/sunsama.png $out/share/pixmaps/sunsama.png
+    install -Dm444 {${appimageContents}/usr,$out}/share/icons/hicolor/512x512/apps/sunsama.png
     substituteInPlace $out/share/applications/sunsama.desktop \
       --replace-fail 'Exec=AppRun' 'Exec=sunsama'
   '';