Compare commits

..

No commits in common. "64d292b156cd1ad0d6370aa0103712c42c80ffef" and "bebbae678f19d8cb78f0a9bc0db067dc30d09f56" have entirely different histories.

5 changed files with 44 additions and 44 deletions

View File

@ -48,7 +48,7 @@ repos:
"@prettier/plugin-ruby@4.0.2", "@prettier/plugin-ruby@4.0.2",
] ]
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 23.9.0 rev: 23.7.0
hooks: hooks:
- id: black - id: black
#- id: black-jupyter #- id: black-jupyter

View File

@ -5,25 +5,20 @@ set -x
# So I don't have to remember these of wonder why my systems have different # So I don't have to remember these of wonder why my systems have different
# set of remotes and are missing something existing on another # set of remotes and are missing something existing on another
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo $@ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo $@ flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
flatpak remote-add --if-not-exists kdeapps https://distribute.kde.org/kdeapps.flatpakrepo $@ flatpak remote-add --if-not-exists kdeapps https://distribute.kde.org/kdeapps.flatpakrepo
flatpak remote-add --if-not-exists nheko-nightly https://nheko.im/nheko-reborn/nheko/-/raw/master/nheko-nightly.flatpakrepo $@ flatpak remote-add --if-not-exists nheko-nightly https://nheko.im/nheko-reborn/nheko/-/raw/master/nheko-nightly.flatpakrepo
# As I cannot find a .flatpakrepo # As I cannot find a .flatpakrepo
flatpak install https://ftp.gajim.org/flatpak/appstream/org.gajim.Gajim.Devel.flatpakref $@ flatpak install https://ftp.gajim.org/flatpak/appstream/org.gajim.Gajim.Devel.flatpakref
# Fedora? # Fedora?
flatpak remote-add --if-not-exists fedora oci+https://registry.fedoraproject.org $@ flatpak remote-add --if-not-exists fedora oci+https://registry.fedoraproject.org
flatpak remote-add --if-not-exists fedora-testing oci+https://registry.fedoraproject.org#testing $@ flatpak remote-add --if-not-exists fedora-testing oci+https://registry.fedoraproject.org#testing
# the previous command does nothing on Fedora as it already exists, but it still # the previous command does nothing on Fedora as it already exists, but it still
# needs to be enabled # needs to be enabled
flatpak remote-modify --enable fedora-testing $@ flatpak remote-modify --enable fedora-testing
# In case of similar issues on other distributions
flatpak remote-modify --enable flathub $@
flatpak remote-modify --enable flathub-beta $@
flatpak remote-modify --enable kdeapps $@
# The other repositories are very unlikely to ship by default with anything
# Hide commands being executed again # Hide commands being executed again
set +x set +x

View File

@ -5,61 +5,66 @@ set -x
# Workarounds for common flatpak app issues # Workarounds for common flatpak app issues
# Reserved directories that cannot be shared # Let's begin by checking remotes and installing what this touches…
# to flatpaks include at least: /usr #flatpak update --appstream
#flatpak install --assumeyes flathub org.briarproject.Briar im.riot.Riot com.nextcloud.desktopclient.nextcloud
# Allowing system themes in flatpaks
flatpak override --filesystem=/usr/local/share/themes:ro --filesystem=/usr/share/themes:ro --filesystem=~/.themes:ro
flatpak override --filesystem=/usr/local/share/icons:ro --filesystem=/usr/share/icons:ro --filesystem=~/.icons:ro
flatpak override --filesystem=/usr/local/share/cursors:ro --filesystem=/usr/share/cursors:ro --filesystem=~/.cursors:ro
# In case debugging flatpaks is subject to the other restrictions and running # In case debugging flatpaks is subject to the other restrictions and running
# gdb there is made easier by access to the file. By same logic, they need # gdb there is made easier by access to the file. By same logic, they need
# to be able to write to the log. # to be able to write to the log.
flatpak override --filesystem=~/.gdbinit:ro --filesystem=~/gdb.txt $@ flatpak override --filesystem=~/.gdbinit:ro --filesystem=~/gdb.txt
# Allow read-only access to ~/.curlrc in case a flatpak is utilising curl # Allow read-only access to ~/.curlrc in case a flatpak is utilising curl
# or libcurl starts reading it # or libcurl starts reading it
flatpak override --filesystem=~/.curlrc:ro $@ flatpak override --filesystem=~/.curlrc:ro
# Backticks and a lot of common characters in all Flatpaks # Backticks and a lot of common characters in all Flatpaks
# https://github.com/flatpak/flatpak/issues/2031 # https://github.com/flatpak/flatpak/issues/2031
flatpak override --talk-name=org.fcitx.Fcitx --talk-name=org.freedesktop.portal.Fcitx $@ flatpak override --talk-name=org.fcitx.Fcitx --talk-name=org.freedesktop.portal.Fcitx
# https://github.com/flathub/org.briarproject.Briar/issues/5 # https://github.com/flathub/org.briarproject.Briar/issues/5
flatpak override org.briarproject.Briar --filesystem=~/.briar:create $@ flatpak override org.briarproject.Briar --filesystem=~/.briar:create
flatpak override org.briarproject.Briar --filesystem=~/.java/.userPrefs/org/briarproject/briar:create $@ flatpak override org.briarproject.Briar --filesystem=~/.java/.userPrefs/org/briarproject/briar:create
# This is an ugly hack so I don't have to maintain the config.json separately # This is an ugly hack so I don't have to maintain the config.json separately
# in every profile and can just symlink it # in every profile and can just symlink it
flatpak override im.riot.Riot --filesystem=~/src/gitea.blesmrt.net/Mikaela/gist/matrix/Element:ro $@ flatpak override im.riot.Riot --filesystem=~/src/gitea.blesmrt.net/Mikaela/gist/matrix/Element:ro
# email signature # email signature
#flatpak override org.claws_mail.Claws-Mail --filesystem=~/.signature:create $@ #flatpak override org.claws_mail.Claws-Mail --filesystem=~/.signature:create
# Directory I have normal Nextcloud in # Directory I have normal Nextcloud in
flatpak override com.nextcloud.desktopclient.nextcloud --filesystem=~/Nextcloud:create $@ flatpak override com.nextcloud.desktopclient.nextcloud --filesystem=~/Nextcloud:create
# PCSX2 files # PCSX2 files
flatpak override net.pcsx2.PCSX2 --filesystem=~/.config/PCSX2:create $@ flatpak override net.pcsx2.PCSX2 --filesystem=~/.config/PCSX2:create
flatpak override net.pcsx2.PCSX2 --filesystem=~/PS2:create $@ flatpak override net.pcsx2.PCSX2 --filesystem=~/PS2:create
# A directory I can share between native and flatpak Steam so both have the # A directory I can share between native and flatpak Steam so both have the
# same games without having to navigate weird paths. # same games without having to navigate weird paths.
flatpak override com.valvesoftware.Steam --filesystem=~/SteamLibrary:create $@ flatpak override com.valvesoftware.Steam --filesystem=~/SteamLibrary:create
flatpak override net.lutris.Lutris --filesystem=~/SteamLibrary:create $@ flatpak override net.lutris.Lutris --filesystem=~/SteamLibrary:create
# For use with system syncthing, note its flags # For use with system syncthing, note its flags
flatpak override me.kozec.syncthingtk --filesystem=~/.config/syncthing:create $@ flatpak override me.kozec.syncthingtk --filesystem=~/.config/syncthing:create
# Just for verbosity. The results can be seen in /var/lib/flatpak/overrides/global # Just for verbosity. The results can be seen in /var/lib/flatpak/overrides/global …
# and /var/lib/flatpak/overrides/<flatpak.id>. flatpak override --show
# The user-configurations are ~/.local/share/flatpak/overrides/ # …and /var/lib/flatpak/overrides/org.briarproject.Briar
flatpak override --show org.briarproject.Briar
flatpak override --show $@ # do I need to list those?
flatpak override --show org.briarproject.Briar $@ flatpak override --show im.riot.Riot
flatpak override --show im.riot.Riot $@ #flatpak override --show org.claws_mail.Claws-Mail
#flatpak override --show org.claws_mail.Claws-Mail $@ flatpak override --show com.nextcloud.desktopclient.nextcloud
flatpak override --show com.nextcloud.desktopclient.nextcloud $@ flatpak override --show net.pcsx2.PCSX2
flatpak override --show net.pcsx2.PCSX2 $@ flatpak override --show com.valvesoftware.Steam
flatpak override --show com.valvesoftware.Steam $@ flatpak override --show net.lutris.Lutris
flatpak override --show net.lutris.Lutris $@ flatpak override --show me.kozec.syncthingtk
flatpak override --show me.kozec.syncthingtk $@
# Hide commands being executed again # Hide commands being executed again
set +x set +x

@ -1 +1 @@
Subproject commit d3c2de466f4f7ec11650555e68f4fc17ba38e3fa Subproject commit 1f1aa0cf26d7a8e28ed523d91798867a513f5733

@ -1 +1 @@
Subproject commit d91148b3d891d2144c7a214a5fbcd6aa9a15b369 Subproject commit ebdd83037d577b79f3093ff02aaf1ea952facb69