packaging: add com.danklinux.dms.desktop entry, remove custom icon

resolution

Makefile

@@ -74,10 +74,11 @@ install-icon:
 	@echo "Icon installed"
 
 install-desktop:
-	@echo "Installing desktop entry..."
+	@echo "Installing desktop entries..."
 	@install -D -m 644 $(ASSETS_DIR)/dms-open.desktop $(APPLICATIONS_DIR)/dms-open.desktop
+	@install -D -m 644 $(ASSETS_DIR)/com.danklinux.dms.desktop $(APPLICATIONS_DIR)/com.danklinux.dms.desktop
 	@update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true
-	@echo "Desktop entry installed"
+	@echo "Desktop entries installed"
 
 install: install-bin install-shell install-completions install-systemd install-icon install-desktop
 	@echo ""
@@ -116,10 +117,11 @@ uninstall-icon:
 	@echo "Icon removed"
 
 uninstall-desktop:
-	@echo "Removing desktop entry..."
+	@echo "Removing desktop entries..."
 	@rm -f $(APPLICATIONS_DIR)/dms-open.desktop
+	@rm -f $(APPLICATIONS_DIR)/com.danklinux.dms.desktop
 	@update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true
-	@echo "Desktop entry removed"
+	@echo "Desktop entries removed"
 
 uninstall: uninstall-systemd uninstall-desktop uninstall-icon uninstall-completions uninstall-shell uninstall-bin
 	@echo ""

assets/com.danklinux.dms.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=DankMaterialShell
+GenericName=Desktop Shell
+Comment=Material 3 inspired shell for Wayland compositors
+Exec=dms run
+Icon=danklogo
+Terminal=false
+NoDisplay=true
+StartupNotify=false
+Categories=Utility;

distro/debian/dms-git/debian/rules

@@ -73,6 +73,7 @@ override_dh_auto_install:
 		cp -r quickshell/* debian/dms-git/usr/share/quickshell/dms/; \
 		install -Dm644 assets/systemd/dms.service debian/dms-git/usr/lib/systemd/user/dms.service; \
 		install -Dm644 assets/dms-open.desktop debian/dms-git/usr/share/applications/dms-open.desktop; \
+		install -Dm644 assets/com.danklinux.dms.desktop debian/dms-git/usr/share/applications/com.danklinux.dms.desktop; \
 		install -Dm644 assets/danklogo.svg debian/dms-git/usr/share/icons/hicolor/scalable/apps/danklogo.svg; \
 	else \
 		echo "ERROR: quickshell directory not found!" && \

distro/debian/dms/debian/rules

@@ -66,6 +66,7 @@ override_dh_auto_install:
 		cp -r DankMaterialShell-$(UPSTREAM_VERSION)/quickshell/* debian/dms/usr/share/quickshell/dms/; \
 		install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/systemd/dms.service debian/dms/usr/lib/systemd/user/dms.service; \
 		install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/dms-open.desktop debian/dms/usr/share/applications/dms-open.desktop; \
+		install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/com.danklinux.dms.desktop debian/dms/usr/share/applications/com.danklinux.dms.desktop; \
 		install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/danklogo.svg debian/dms/usr/share/icons/hicolor/scalable/apps/danklogo.svg; \
 	else \
 		echo "ERROR: DankMaterialShell-$(UPSTREAM_VERSION) directory not found!" && \

distro/fedora/dms-git.spec

@@ -121,6 +121,7 @@ core/bin/${DMS_BINARY} completion fish > %{buildroot}%{_datadir}/fish/vendor_com
 install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
 
 install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop
+install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop
 install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
 
 # Install shell files to shared data location
@@ -144,6 +145,7 @@ pkill -USR1 -x dms >/dev/null 2>&1 || :
 %{_datadir}/quickshell/dms/
 %{_userunitdir}/dms.service
 %{_datadir}/applications/dms-open.desktop
+%{_datadir}/applications/com.danklinux.dms.desktop
 %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
 
 %files -n dms-cli

distro/fedora/dms.spec

@@ -89,6 +89,7 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
 install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
 
 install -Dm644 %{_builddir}/dms-qml/assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop
+install -Dm644 %{_builddir}/dms-qml/assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop
 install -Dm644 %{_builddir}/dms-qml/assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
 
 install -dm755 %{buildroot}%{_datadir}/quickshell/dms
@@ -111,6 +112,7 @@ pkill -USR1 -x dms >/dev/null 2>&1 || :
 %{_datadir}/quickshell/dms/
 %{_userunitdir}/dms.service
 %{_datadir}/applications/dms-open.desktop
+%{_datadir}/applications/com.danklinux.dms.desktop
 %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
 
 %files -n dms-cli

distro/opensuse/dms-git.spec

@@ -116,6 +116,7 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
 install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
 
 install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop
+install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop
 install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
 
 install -dm755 %{buildroot}%{_datadir}/quickshell/dms
@@ -151,6 +152,7 @@ pkill -USR1 -x dms >/dev/null 2>&1 || :
 %{_datadir}/quickshell/dms/
 %{_userunitdir}/dms.service
 %{_datadir}/applications/dms-open.desktop
+%{_datadir}/applications/com.danklinux.dms.desktop
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/scalable
 %dir %{_datadir}/icons/hicolor/scalable/apps

distro/opensuse/dms.spec

@@ -65,6 +65,7 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
 install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
 
 install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop
+install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop
 install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
 
 install -dm755 %{buildroot}%{_datadir}/quickshell/dms
@@ -98,6 +99,7 @@ pkill -USR1 -x dms >/dev/null 2>&1 || :
 %{_datadir}/quickshell/dms/
 %{_userunitdir}/dms.service
 %{_datadir}/applications/dms-open.desktop
+%{_datadir}/applications/com.danklinux.dms.desktop
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/scalable
 %dir %{_datadir}/icons/hicolor/scalable/apps

distro/ubuntu/dms-git/debian/rules

@@ -73,6 +73,8 @@ override_dh_auto_install:
 	# Install desktop file and icon
 	install -Dm644 dms-git-repo/assets/dms-open.desktop \
 		debian/dms-git/usr/share/applications/dms-open.desktop
+	install -Dm644 dms-git-repo/assets/com.danklinux.dms.desktop \
+		debian/dms-git/usr/share/applications/com.danklinux.dms.desktop
 	install -Dm644 dms-git-repo/assets/danklogo.svg \
 		debian/dms-git/usr/share/icons/hicolor/scalable/apps/danklogo.svg
 

distro/ubuntu/dms/debian/rules

@@ -54,6 +54,8 @@ override_dh_auto_install:
 	# Install desktop file and icon
 	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dms-open.desktop \
 		debian/dms/usr/share/applications/dms-open.desktop
+	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/com.danklinux.dms.desktop \
+		debian/dms/usr/share/applications/com.danklinux.dms.desktop
 	install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/danklogo.svg \
 		debian/dms/usr/share/icons/hicolor/scalable/apps/danklogo.svg
 

distro/void/srcpkgs/dms/template

@@ -32,6 +32,7 @@ post_install() {
 
 	# Desktop entry + icon
 	vinstall "${wrksrc}/assets/dms-open.desktop" 644 usr/share/applications
+	vinstall "${wrksrc}/assets/com.danklinux.dms.desktop" 644 usr/share/applications
 	vinstall "${wrksrc}/assets/danklogo.svg" 644 usr/share/icons/hicolor/scalable/apps
 
 	# Shell completions (generated by the built binary; skip when cross-building)

flake.nix

@@ -131,6 +131,8 @@
                 # Install desktop file and icon
                 install -D ${rootSrc}/assets/dms-open.desktop \
                   $out/share/applications/dms-open.desktop
+                install -D ${rootSrc}/assets/com.danklinux.dms.desktop \
+                  $out/share/applications/com.danklinux.dms.desktop
                 install -D ${rootSrc}/core/assets/danklogo.svg \
                   $out/share/hicolor/scalable/apps/danklogo.svg
 

quickshell/Common/Paths.qml

@@ -113,8 +113,7 @@ Singleton {
     }
 
     function getAppIcon(appId: string, desktopEntry: var): string {
-        // ! TODO - after QS 0.3, we can install our icon properly
+        if (appId === "org.quickshell") {
-        if (appId === "org.quickshell" || appId === "com.danklinux.dms") {
             return Qt.resolvedUrl("../assets/danklogo.svg");
         }