From 6f78ce84a7f5b15ef77df29e43194b8cdd08d14f Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Thu, 12 Jan 2023 10:34:53 +0000 Subject: [PATCH] Update 4 files - /home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl - /home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl - /home/.chezmoiexternal.toml - /software.yml --- home/.chezmoiexternal.toml | 2 +- .../run_onchange_after_19-theme-files.tmpl | 12 ++-- .../run_onchange_after_70-misc-bug-fixes.tmpl | 71 +++++++++++++++++++ software.yml | 3 +- 4 files changed, 80 insertions(+), 8 deletions(-) diff --git a/home/.chezmoiexternal.toml b/home/.chezmoiexternal.toml index 1ce6de7e..b9cc551f 100644 --- a/home/.chezmoiexternal.toml +++ b/home/.chezmoiexternal.toml @@ -26,7 +26,7 @@ pull.args = ["--ff-only"] [".local/src/candy-icons"] type = "git-repo" - url = "https://github.com/EliverLara/candy-icons.git" + url = "https://github.com/ProfessorManhattan/candy-icons.git" clone.args = ["--depth", "1"] pull.args = ["--ff-only"] [".local/src/yoru"] diff --git a/home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl index bc27d91c..32a18234 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_19-theme-files.tmpl @@ -33,11 +33,11 @@ else fi ### Flatten theme files (i.e. convert symlinks to regular files) -if command -v squash-symlink > /dev/null; then - logg info 'Converting all theme symlinks to equivalent regular files' - sudo find /usr/local/share -type l -exec squash-symlink {} + -else - logg warn '`squash-symlink` is not a script in the PATH' -fi +#if command -v squash-symlink > /dev/null; then +# logg info 'Converting all theme symlinks to equivalent regular files' +# sudo find /usr/local/share -type l -exec squash-symlink {} + +#else +# logg warn '`squash-symlink` is not a script in the PATH' +#fi {{ end -}} diff --git a/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl index 49667bc9..5763c4ed 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl @@ -29,4 +29,75 @@ else logg warn '`rsync` is missing from the system!' fi +##### CANDY ICONS START ###### + +### Additional icons +SRC="/usr/local/share/icons/Candy/apps/scalable" +TAR="/usr/local/share/icons/Candy/apps/scalable" +if [ -d "$SRC" ] && [ -d "$TAR" ]; the + logg info 'Adding similar substitutes for some apps in the Candy icons theme' + if [ -f "$SRC/youtube-dl-gui.svg" ]; then + sudo cp -f "$SRC/youtube-dl-gui.svg" "$TAR/com.github.Johnn3y.Forklift.svg" + fi + if [ -f "$SRC/rdm.svg" ]; then + sudo cp -f "$SRC/rdm.svg" "$TAR/app.resp.RESP.svg" + fi + if [ -f "$SRC/preferences-system-power.svg" ]; then + sudo cp -f "$SRC/preferences-system-power.svg" "$TAR/org.gnome.PowerStats.svg" + fi + if [ -f "$SRC/software-store.svg" ]; then + sudo cp -f "$SRC/software-store.svg" "$TAR/software-properties-gtk.svg" + fi +fi + +### Icons added to fork (https://github.com/ProfessorManhattan/candy-icons) +# These commented out icons already had good matches in the Sweet theme so a fork was created +# and a pull request was open for them. +# sudo cp -f "$SRC/gitkraken.svg" "$TAR/com.axosoft.GitKraken.svg" +# sudo cp -f "$SRC/github-desktop.svg" "$TAR/io.github.shiftey.Desktop" +# sudo cp -f "$SRC/inkscape.svg" "$TAR/inkscape_inkscape.desktop" +# sudo cp -f "$SRC/cutter.svg" "$TAR/re.rizin.cutter.svg" +# sudo cp -f "$SRC/arduino.svg" "$TAR/cc.arduino.IDE2.svg" +# sudo cp -f "$SRC/intellij.svg" "$TAR/intellij-idea-community_intellij-idea-community.svg" +# sudo cp -f "$SRC/google-chrome.svg" "$TAR/com.google.Chrome.svg" +# sudo cp -f "$SRC/firefox.svg" "$TAR/org.mozilla.firefox.svg" +# sudo cp -f "$SRC/microsoft-edge.svg" "$TAR/com.microsoft.Edge.svg" +# sudo cp -f "$SRC/thunderbird.svg" "$TAR/org.mozilla.Thunderbird.svg" +# sudo cp -f "$SRC/postman.svg" "$TAR/com.getpostman.Postman.svg" +# sudo cp -f "$SRC/plexhometheater.svg" "$TAR/tv.plex.PlexDesktop.svg" +# sudo cp -f "$SRC/seafile.svg" "$TAR/com.client.Seafile.svg" +# sudo cp -f "$SRC/com.github.gi_lom.dialect.svg" "$TAR/app.drey.Dialect.svg" + +### Missing icons +# The following applications are missing icons after using the "Full" installer. The application name +# is listed. To the right of each hyphen is the name of the `.desktop` file. +# Webkit Font Generator - +# Lepton - lepton_lepton +# scrcpygui +# scrcpy - scrcpy_scrcpy +# Shotcut - org.shotcut.Shotcut +# Kooha - io.github.seadve.Kooha +# Lens - kontena-lens_kontena-lens +# Proton Mail Bridge - ch.protonmail.protonmail-bridge +# Proton Import-Export app - ch.protonmail.protonmail-import-export-app +# MQTTX - com.emqx.MQTTX +# Mockoon - mockoon_mockoon +# PowerShell - powershell_powershell +# GNOME Network Displays - org.gnome.NetworkDisplays +# Cockpit Client - org.cockpit_project.CockpitClient +# Yubico Authenticator - com.yubico.yubioath +# OnlyKey App - onlykey-app_onlykey-app +# Gitter - im.gitter.Gitter +# Jitsi Meet - org.jitsi.jitsi-meet +# Keybase +# Nuclear - org.js.nuclear.Nuclear +# Motrix - net.agalwood.Motrix +# Raspberry Pi Imager - org.raspberrypi.rpi-imager +# Junction - re.sonny.Junction +# GNOME Extension Manager - com.mattjakeman.ExtensionManager +# Startup Applications +# Multipass - multipass_gui + +##### CANDY ICONS END ###### + {{ end -}} diff --git a/software.yml b/software.yml index a4c8ffcf..0f3203b7 100644 --- a/software.yml +++ b/software.yml @@ -200,7 +200,8 @@ softwarePackages: - gnome-weather - junction - kooha - - newsflash + # No icon available and the Feedly browser extension is preferred since it can sync / is cross-platform + # - newsflash - vup - warp-transfer - web-font-generator