From f3b63c11a768771b4809a308f37d6be47b8abe93 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 6 Jan 2025 14:54:52 +0900 Subject: [PATCH 1/2] Use default profile in PWA shortcut --- config/pwa/README.md | 1 + config/pwa/amazon_music.desktop | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/pwa/README.md b/config/pwa/README.md index dbf1d839..82b6eeea 100644 --- a/config/pwa/README.md +++ b/config/pwa/README.md @@ -1,4 +1,5 @@ # PWA - Don't use Firefox, that does not support PWA +- Don't use multiple google accounts in PWA shortcut, we cannot determine which profile number will use the account. See GH-813 and GH-968 - Take care to deploy container if you wrap with chrome package and the path diff --git a/config/pwa/amazon_music.desktop b/config/pwa/amazon_music.desktop index 1855281c..d21cc6bc 100644 --- a/config/pwa/amazon_music.desktop +++ b/config/pwa/amazon_music.desktop @@ -4,6 +4,6 @@ Version=1.0 Terminal=false Type=Application Name=Amazon Music -Exec=google-chrome-stable "--profile-directory=Profile 1" --app-id=dojpeppajphepagdhclblkkjnoaeamee -Icon=chrome-dojpeppajphepagdhclblkkjnoaeamee-Profile_1 +Exec=google-chrome-stable "--profile-directory=Default" --app-id=dojpeppajphepagdhclblkkjnoaeamee +Icon=chrome-dojpeppajphepagdhclblkkjnoaeamee-Default StartupWMClass=crx_dojpeppajphepagdhclblkkjnoaeamee From ed5f1bad21482c64aac30155b61788233e6a7b14 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 6 Jan 2025 15:34:26 +0900 Subject: [PATCH 2/2] Uninstall PWA shortcuts from GNOME --- config/pwa/README.md | 5 ----- config/pwa/amazon_music.desktop | 9 --------- config/pwa/spotify.desktop | 9 --------- home-manager/gnome.nix | 13 ++----------- nixos/desktop/default.nix | 2 +- 5 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 config/pwa/README.md delete mode 100644 config/pwa/amazon_music.desktop delete mode 100644 config/pwa/spotify.desktop diff --git a/config/pwa/README.md b/config/pwa/README.md deleted file mode 100644 index 82b6eeea..00000000 --- a/config/pwa/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# PWA - -- Don't use Firefox, that does not support PWA -- Don't use multiple google accounts in PWA shortcut, we cannot determine which profile number will use the account. See GH-813 and GH-968 -- Take care to deploy container if you wrap with chrome package and the path diff --git a/config/pwa/amazon_music.desktop b/config/pwa/amazon_music.desktop deleted file mode 100644 index d21cc6bc..00000000 --- a/config/pwa/amazon_music.desktop +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Version=1.0 -Terminal=false -Type=Application -Name=Amazon Music -Exec=google-chrome-stable "--profile-directory=Default" --app-id=dojpeppajphepagdhclblkkjnoaeamee -Icon=chrome-dojpeppajphepagdhclblkkjnoaeamee-Default -StartupWMClass=crx_dojpeppajphepagdhclblkkjnoaeamee diff --git a/config/pwa/spotify.desktop b/config/pwa/spotify.desktop deleted file mode 100644 index 3d9165cc..00000000 --- a/config/pwa/spotify.desktop +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Version=1.0 -Terminal=false -Type=Application -Name=Spotify -Exec=google-chrome-stable --profile-directory=Default --app-id=pjibgclleladliembfgfagdaldikeohf -Icon=chrome-pjibgclleladliembfgfagdaldikeohf-Default -StartupWMClass=crx_pjibgclleladliembfgfagdaldikeohf diff --git a/home-manager/gnome.nix b/home-manager/gnome.nix index 53451f38..d091cdbe 100644 --- a/home-manager/gnome.nix +++ b/home-manager/gnome.nix @@ -1,13 +1,6 @@ { lib, pkgs, ... }: -let - spotify-pwa-file = "chrome-pjibgclleladliembfgfagdaldikeohf-Default.desktop"; - amazon_music-pwa-file = "chrome-dojpeppajphepagdhclblkkjnoaeamee-Profile_1.desktop"; -in { - xdg.dataFile."applications/${spotify-pwa-file}".source = ../config/pwa/spotify.desktop; - xdg.dataFile."applications/${amazon_music-pwa-file}".source = ../config/pwa/amazon_music.desktop; - # https://github.com/nix-community/home-manager/blob/release-24.11/modules/misc/dconf.nix dconf = { enable = true; @@ -40,14 +33,14 @@ in ] ); - # Might be needed to reboot to enable icons + # - Might be needed to reboot to enable icons + # - Using fixed profile shortcut is difficult in chrome. So don't add PWA here. See GH-813 and GH-968 for detail. favorite-apps = [ "com.mitchellh.ghostty.desktop" "dev.zed.Zed.desktop" "google-chrome.desktop" "podman-desktop.desktop" "io.gitlab.news_flash.NewsFlash.desktop" - amazon_music-pwa-file "org.gnome.Rhythmbox3.desktop" "org.gnome.Nautilus.desktop" ]; @@ -236,8 +229,6 @@ in "org/gnome/shell/extensions/auto-move-windows" = { application-list = [ - "${spotify-pwa-file}:3" - "${amazon_music-pwa-file}:3" "org.gnome.Rhythmbox3.desktop:3" ]; }; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index b4926c64..52e8618f 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -25,7 +25,7 @@ "lp" # For scanner ]; packages = [ - # Don't install spotify, it does not activate IME and no binary cache with the unfree license. + # Don't install unfree packages such as spotify. # Use Web Player or PWA ]; };