sxmo-utils: add a few more apps i use

pkgs/additional/sxmo-utils/0105-more-apps.patch

@@ -1,56 +0,0 @@
-diff --git a/configs/default_hooks/sxmo_hook_apps.sh b/configs/default_hooks/sxmo_hook_apps.sh
-index ba70a31..9f5a129 100755
---- a/configs/default_hooks/sxmo_hook_apps.sh
-+++ b/configs/default_hooks/sxmo_hook_apps.sh
-@@ -31,6 +31,7 @@ write_line_app audacity "$icon_mic Audacity" "audacity"
- write_line_app gnome-calculator "$icon_clc Calculator" "gnome-calculator"
- write_line_app calcurse "$icon_clk Calcurse" "sxmo_terminal.sh calcurse"
- write_line_app cmus "$icon_mus Cmus" "sxmo_terminal.sh cmus"
-+write_line_app cozy "$icon_mus Cozy" "com.github.geigi.cozy"
- write_line_app dino "$icon_msg Dino" "GDK_SCALE=1 dino"
- write_line_app dolphin "$icon_dir Dolphin" "dolphin"
- write_line_app emacs "$icon_edt Emacs (Terminal)" "sxmo_terminal.sh emacs -nw"
-@@ -54,19 +55,25 @@ write_line_app giara "$icon_red Giara" "giara"
- write_line_app gnome-chess "$icon_chs Gnome Chess" "gnome-chess"
- write_line_app gomuks "$icon_msg Gomuks" "sxmo_terminal.sh gomuks"
- write_line_app gpodder "$icon_rss gPodder" "gpodder"
-+write_line_app gthumb "$icon_img gThumb" "gthumb"
- write_line_app gucharmap "$icon_inf Gucharmap" "gucharmap"
- write_line_app hexchat "$icon_msg Hexchat" "hexchat"
- write_line_app htop "$icon_cfg Htop" "sxmo_terminal.sh htop"
- write_line_app irssi "$icon_msg Irssi" "sxmo_terminal.sh irssi"
- write_line_app ii "$icon_msg Ii" "sxmo_terminal.sh ii"
- write_line_app ipython "$icon_trm IPython" "sxmo_terminal.sh ipython"
-+write_line_app jellyfinmediaplayer "$icon_mvi Jellyfin" "jellyfinmediaplayer"
- write_line_app kasts "$icon_rss Kasts" "kasts"
- write_line_app kmail "$icon_eml KMail" "kmail"
-+write_line_app komikku "$icon_bok Komikku" "komikku"
- write_line_app kontact "$icon_msg Kontact" "kontact"
- write_line_app konversation "$icon_msg Konversation" "konversation"
-+write_line_app koreader "$icon_bok KOReader" "koreader"
- write_line_app kwrite "$icon_edt Kwrite" "kwrite"
- write_line_app lagrange "$icon_glb Lagrange" "lagrange"
-+write_line_app lemoa "$icon_grp Lemoa" "lemoa"
- write_line_app lf "$icon_dir Lf" "sxmo_terminal.sh lf"
-+write_line_app librewolf "$icon_glb Librewolf" "librewolf"
- write_line_app lollypop "$icon_mus Lollypop" "lollypop"
- write_line_app luakit "$icon_glb Luakit" "luakit"
- write_line_app marble "$icon_map Marble" "marble"
-@@ -97,6 +104,7 @@ write_line_app senpai "$icon_msg Senpai" "sxmo_terminal.sh senpai"
- write_line_app sic "$icon_msg Sic" "sxmo_terminal.sh sic"
- ([ "$SXMO_WM" = dwm ] && command -v st >/dev/null) && \
- 	write_line "$icon_trm St" "st -e $SHELL"
-+write_line_app sublime-music "$icon_mus Sublime Music" "sublime-music"
- write_line_app surf "$icon_glb Surf" "surf"
- write_line_app syncthing "$icon_rld Syncthing" "syncthing"
- write_line_app telegram-desktop "$icon_tgm Telegram" "telegram-desktop"
-@@ -104,7 +112,9 @@ write_line_app termite "$icon_trm Termite" "termite -e $SHELL"
- write_line_app thunar "$icon_dir Thunar" "sxmo_terminal.sh thunar"
- write_line_app thunderbird "$icon_eml Thunderbird" "thunderbird"
- write_line_app com.github.bleakgrey.tootle "$icon_msg Tootle" "com.github.bleakgrey.tootle"
-+write_line_app re.sonny.Tangram "$icon_glb Tangram" "re.sonny.Tangram"
- write_line_app totem "$icon_mvi Totem" "totem"
-+write_line_app dev.geopjr.Tuba "$icon_grp Tuba" "dev.geopjr.Tuba"
- write_line_app tuir "$icon_red Tuir" "sxmo_terminal.sh tuir"
- write_line_app tut "$icon_msg Tut" "sxmo_terminal.sh tut"
- write_line_app waydroid "$icon_and Waydroid" "waydroid show-full-ui"

pkgs/additional/sxmo-utils/default.nix

@@ -46,8 +46,6 @@ let
       })
     ];
     unmerged = [
-      # let NixOS manage the audio daemons (pulseaudio/pipewire)
-      ./0005-system-audio.patch
       # (fetchpatch {
       #   XXX: doesn't apply cleanly to 1.14.2 release
       #   # Don't wait for led or status bar in state change hooks
@@ -60,9 +58,21 @@ let
         url = "https://lists.sr.ht/~mil/sxmo-devel/patches/42876/mbox";
         hash = "sha256-Oa0MI0Kt9Xgl5L1KarHI6Yn4+vpRxUSujB1iY4hlK9c=";
       })
+
+      ## TODO: send these upstream
+      (fetchpatch {
+        name = "sxmo_hook_apps: add a few";
+        url = "https://git.uninsane.org/colin/sxmo-utils/commit/f99f474bf079da21a2afb5a97cbc9d52da496476.patch";
+        hash = "sha256-3WGgAJqiivUyC/wLpcxoQQq8b0qw+EVSfgHdVq+Iv4g=";
+      })
+
+      ## these might or might not be upstream-worthy
       ./0104-full-auto-rotate.patch
-      ./0105-more-apps.patch
       # ./0106-no-restart-lisgd.patch
+
+      ## not upstreamable
+      # let NixOS manage the audio daemons (pulseaudio/pipewire)
+      ./0005-system-audio.patch
     ];
   };
 in {