Commit graph

716 commits

Author SHA1 Message Date
xyny
12d223f8bc
feat: add wallpaper authoship information (#68) 2024-01-24 15:39:51 +00:00
fiftydinar
8b8fcd3144
fix(akmods): Xone installs conflicted "akmod-xone" package (#102)
* fix(akmods): Xone installs conflicted "akmod-xone" package

This sets higher priority for `akmods repo` compared to `multimedia repo`, which should fix potential issues in the future for other akmods too.

Thanks to the debugging done here:
https://github.com/ublue-os/akmods/pull/116

* fix(akmods): There is no need to revert to default, as it doesn't cause issues

On the other side, enabled multimedia repo afterwards causes issues.

* chore(akmods): Format function spacing same as other 2 functions

* chore(akmods): Make ENABLE_MULTIMEDIA_REPO more readable
2024-01-24 10:45:05 +00:00
fiftydinar
fe9cd68c6a
fix(default-flatpaks): Install/uninstall system flatpaks regardless i… (#100)
* fix(default-flatpaks): Install/uninstall system flatpaks regardless if current user has permissions or not

Fixes: https://github.com/ublue-os/bling/pull/93

To make notify-send working for --system systemd units, I have to thank @gerblesh for his code & idea in ublue-updater.

I tested this in Silverblue & it works.
However, I would like this to be tested in other DEs like Kinoite too, to see if it's working correctly.

Feel free to improve code if you find some space for that.

@lorduskordus

* Use json parser instead as a more reliable solution on fetching values

* There is no need for echo when parsing json

* Fetch DISPLAY environment variable from printenv

* Make functions for notify-sends, to make script clearer

* Whiteline fixes
2024-01-20 16:38:51 +00:00
Nick Saika
17bacbe3da
fix: Fix flag ordering in set calls in scripts (#99)
The README for scripts has an incorrect use of the `set`. Where it says
to use:

	set -oue pipefail

it should be:

	set -euo pipefail

since `pipefail` is an option consumed by `set -o`.

More information: https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
2024-01-16 06:12:08 +00:00
Tulili
e530978bb4
Merge pull request #98 from fiftydinar/akmods-multimedia-fix
fix(akmods): Failure when installing akmods from multimedia repo
2024-01-14 14:57:55 -08:00
fiftydinar
ed83ff5ec2 fix(akmods): Failure when installing akmods from multimedia repo 2024-01-14 23:54:02 +01:00
xyny
ec49d9d4ab
chore: remove bling justfiles (#95) (#97)
what we're losing with this:
- distrobox-rocky & distrobox-alpine (could be added to config if wanted)
- emudeck & deckyloader install scripts (unmaintained, undocumented)
- setup-gaming (installs random collection of flatpaks, unmaintained, legacy)
- funnily named nix recipes (nix me up)(unmaintained, exists in config with different names)
2024-01-14 17:35:31 +00:00
fiftydinar
e8272a4dd1
feat: Add akmods module (#89)
* feat: Add kmods installer module

Credits: @C0dePlayer

This is not ideal as it does not support custom kernels & it involves editing Containerfile.

I believe there is no other way but to make users edit Containerfile for those files to be even pulled of.

I would like this to be through the recipe only, so I will put this as a draft until some better ideas come.

* Rename kmods installer to akmods

* Update README

Address: 

https://github.com/ublue-os/startingpoint/pull/212#issuecomment-1870156327

https://github.com/ublue-os/bling/pull/89#discussion_r1436890002

* Fix README typo

* Remove non-needed space for yml in README

* Add support for Surface & Asus images

* Clarify tagged base image warning better

* Clarify tagged base image warning better pt.2

* There is no need to fetch main-nvidia build for now

* Use simpler =~ for conditioning instead of grep & sed

This finally fixes akmods module

* Install kernel-devel-matched for all builds

* Assure that Surface installs their version of kernel-devel-matched

* Mention that framework images can be used as a base

* Delete duplicate warning message

* Remove non-needed explanation on why only Universal Blue builds are supported

* Clarify 1st warning better

* Clarify `main` akmods compatibility better

This would avoid editing README if some other compatible image gets announced or discontinued.

* docs(akmods): grammar fixes

* docs: add link to akmod tag matrix

---------

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
2024-01-14 16:45:20 +00:00
HikariKnight
3e17e2c1dd
chore(just): remove nix.just file as functionality is duplicate to config repo
chore(just): remove nix.just file as functionality is duplicate to that of config repo
2024-01-14 16:45:10 +01:00
HikariKnight
3a29fa77d2 chore(just): remove nix.just import 2024-01-14 16:20:27 +01:00
HikariKnight
cc31a082fe chore(just): remove nix just file due to duplicate functionality with config repo 2024-01-14 16:15:16 +01:00
Jorge O. Castro
2733aca02e
Merge pull request #90 from ublue-os/just-import
chore: migrate justfile to import
2024-01-04 21:05:14 -05:00
xyny
dc60cfaa42
fix(gnome-vrr): use correct version variable (#94) 2023-12-31 10:44:09 +00:00
xyny
f3e6e1c4fe
fix: add single quotes for paths 2023-12-31 10:38:21 +00:00
fiftydinar
33226b9b73
feat(systemd): Add support for unmasking & masking units (#88)
* feat(systemd): Add support for masking services

* Use unit term in README

* Fix README grammar

* Note about unmasking

* Fix typo in README

* Add unmask & more info about systemctl commands

Address:

https://github.com/ublue-os/bling/pull/88#discussion_r1436877565

https://github.com/ublue-os/bling/pull/88#discussion_r1436917124

* docs: clarify purpose of unmasking

* docs: Fix systemd module README typo

---------

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
2023-12-31 10:31:49 +00:00
RJ Trujillo
9357cf17f1
Merge pull request #92 from fiftydinar/main
fix(default-flatpaks): Clarify branched flatpaks support better
2023-12-28 18:30:31 -07:00
fiftydinar
f08f1b26d1
Update README.md 2023-12-29 02:18:35 +01:00
fiftydinar
4e54d34b62 Merge branch 'main' of https://github.com/fiftydinar/bling 2023-12-29 02:17:37 +01:00
fiftydinar
d32dc2ed2d fix(default-flatpaks): Clarify branched flatpaks support better 2023-12-28 21:24:55 +01:00
RJ Trujillo
a63cb73fed
Merge pull request #91 from fiftydinar/default-flatpaks-user-system-fix
fix(default-flatpaks): False notification for "uninstalling" a flatpak
2023-12-28 11:32:02 -07:00
fiftydinar
a73390f88b fix(default-flatpaks): False notification for "uninstalling" a flatpak
This is an edge usecase where this happens, I can give an example:

1. User sets that default-flatpaks uninstalls "Telegram" `system` flatpak. Default-flatpak does that job successfully.
2. Afterwards, he installs "Telegram" as `user` flatpak
3. False notification will appear on boot that "Telegram" `system` flatpak is uninstalled (reminder that "Telegram" is already uninstalled successfully in step 1).

I found out that you can set `--user` & `--system` flag when issuing flatpak column list of applications.

This change solves the problem.
2023-12-28 18:53:24 +01:00
xyny
d715e01e62
chore: migrate justfile to import
https://github.com/ublue-os/config/issues/178

Also changes to relative imports for less clutter.
2023-12-27 10:24:08 +00:00
fiftydinar
ec020cd2ca
fix(default-flatpaks): Missing notification for system flatpaks (#87)
* fix:(default-flatpaks): Missing notification for system flatpaks

This approach, while more fragmented, it's cleaner, as there is a clearer separation of root & non-root operations done by flatpak-setup service. This should probably increase security too (but I'm not the expert to talk seriously about that). It also gets rid of some non-harming error for /var data, can't remember it fully.

While it may be confusing for users that they have to type:

`systemctl status --user system-flatpak-setup`

instead of previous:

`systemctl status system-flatpak-setup`

It is something worth sacrificing for the important user-experience fix.
2023-12-27 09:12:49 +00:00
HikariKnight
f75eddd56c
Merge pull request #86 from fiftydinar/default-flatpaks-fix
fix(default-flatpaks): Add missing execute permission to binaries
2023-12-22 18:06:18 +01:00
fiftydinar
b28ebea9d2 fix(default-flatpaks): Add missing execute permission to binaries 2023-12-22 15:03:27 +01:00
xyny
8d59b2a3ec
fix(default-flatpaks): (again) do the yq notify step right
for real this time
2023-12-22 11:30:06 +00:00
xyny
f67cfce6d5
fix(default-flatpaks): get notify config from right var? 2023-12-22 05:04:57 +00:00
fiftydinar
bd92e7e5c5
feat(default-flatpaks): Add info about which flatpaks are installed (#85)
* feat(default-flatpaks): Add info about which flatpaks are installed & uninstalled in notification. Also implement notification enable/disable config support.

* feat(default-flatpaks): Add support for configuring notifications in recipe file

* fix(default-flatpaks): Formatting fixes

* fix(default-flatpaks): Fix "enabling" typo instead of "configuring" notifications

* chore(default-flatpaks): Remove unused yq command

* fix(default-flatpaks): There is no need for 2 double quotes
2023-12-21 20:34:33 +00:00
Micah Abbott
623834bb3b
chore: force create firstboot symlink in yafti module (#82)
I switched my custom ublue image from using
"ublue-os/silverblue-nvidia" to "ublue-os/bazzite-gnome-nvidia" and
received the following error when the build action kicked off:

`ln: failed to create symbolic link '/usr/etc/profile.d/ublue-firstboot.sh': File exists`

The yafti module should be the only thing creating this symlink, so it
should be safe to use the `-f` flag to force creating it.

Signed-off-by: Micah Abbott <miabbott@redhat.com>
2023-12-21 05:59:33 +00:00
RJ Trujillo
cd1cd16519
Merge pull request #83 from fiftydinar/flatpak-fix
fix(default-flatpaks): Install & uninstall flatpaks on every boot
2023-12-20 06:20:16 -07:00
fiftydinar
dbc867ff55 Indicate that module skips flatpak install/uninstall if no changes are detected 2023-12-20 11:24:00 +01:00
fiftydinar
f3e2378439 Echo adding & setting title for remote when it's actually done 2023-12-20 10:18:50 +01:00
fiftydinar
07f1797838 Delete some README misinformation
It will loop on every boot to install & uninstall
2023-12-20 10:15:14 +01:00
fiftydinar
09af3b3602 Tiny README fix 2023-12-20 09:59:50 +01:00
fiftydinar
bf753ad0b6 Update README information to reflect these changes 2023-12-20 09:54:12 +01:00
fiftydinar
622c364e96 Send notifications for installed & uninstalled flatpaks only when it's done 2023-12-20 09:43:34 +01:00
fiftydinar
dc3cb750a3 There is no need for $flatpak string in uninstall command 2023-12-20 09:00:22 +01:00
fiftydinar
c550d67a29 Fix install & uninstall for more than 1 flatpak in the list 2023-12-20 08:53:07 +01:00
fiftydinar
40a45f6e5e Fix some formatting 2023-12-19 21:32:39 +01:00
fiftydinar
7b4b6581c8 fix(default-flatpaks): Install & uninstall only those flatpaks which are missing from the list.
This allows us to ditch the state file concept, which only allows us to run flatpak-setup once. After that, you need to manually delete the state file (system & user-flatpak-configured) if you want to have new changes from flatpak-setup.

This is not ideal.

We do not have the luxury of Bazzite, which allows you to change the version of the setup in setup service to automatically start it again (that's what they do).

Instead, we will install & uninstall only those flatpaks which are not on the list, ditching the need to have version checking.

I incorporated some shell formatting fixes, thanks to shellcheck.net.

The only thing that doesn't work right now is installing flatpaks from install list when you have some flatpaks installed already. Grep -v doesn't work for some reason when piped with echo, I'm looking in how to fix this.
I'm also looking into potentially bringing automatic version adjustment whenever you change the flatpak list/repo if possible, to ensure that flatpak-setup service exits immediately if there are no changes, compared to running fully checking for updates.
2023-12-19 14:33:17 +01:00
Kyle Gospodnetich
2d015f9de2
Merge pull request #81 from fiftydinar/main
fix: Revert "fix(default-flatpaks): Don't install packages that are al…
2023-12-18 01:19:49 -08:00
fiftydinar
4e42e3d004 Revert "fix(default-flatpaks): Don't install packages that are already present or remove packages that aren't there"
This reverts commit 0e97138535.
2023-12-18 09:46:21 +01:00
Jorge O. Castro
c947f86b2f
Merge pull request #79 from ublue-os/dependabot/github_actions/sigstore/cosign-installer-3.3.0
chore(deps): bump sigstore/cosign-installer from 3.2.0 to 3.3.0
2023-12-15 20:13:27 -07:00
Kyle Gospodnetich
9e557930cf
Merge pull request #80 from fiftydinar/main
fix(default-flatpaks): Dont install packages that are already present
2023-12-14 14:38:45 -08:00
fiftydinar
0e97138535 fix(default-flatpaks): Don't install packages that are already present or remove packages that aren't there
By @EyeCantCU

Took from Bazzite.

Please check if I did changes correctly.
2023-12-14 23:23:03 +01:00
dependabot[bot]
c5c89fa741
chore(deps): bump sigstore/cosign-installer from 3.2.0 to 3.3.0
Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](https://github.com/sigstore/cosign-installer/compare/v3.2.0...v3.3.0)

---
updated-dependencies:
- dependency-name: sigstore/cosign-installer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-11 15:15:15 +00:00
Tulili
c0943c009d
Merge pull request #76 from nadavspi/fix-laptop-just
fix: make `laptop` work without `justfiles`
2023-11-27 13:12:02 -08:00
Nadav Spiegelman
7eae821110 fix: make laptop work without justfiles
Make sure /usr/share/ublue-os/just/bling exists in case we're using
`laptop` without `justfiles`
2023-11-24 14:12:33 -05:00
Patrick Csikos
f0c0192e10
feat(default-flatpaks): Better handle multiple uses of module (#74)
* fix(default-flatpaks): Always enable systemd services

Ensures that the module always removes Fedora Flatpaks, even if a
system-wide flatpak remote isn't configured for the module.

* chore(default-flatpaks): Add output for result of repo config

* fix(default-flatpaks): Better handle multiple uses of module

* chore(default-flatpaks): Add label to output of existing config

* docs(default-flatpaks): Mention that Flatpak remote can be re-configured

* docs(default-flatpaks): Add second example to README

* docs(default-flatpaks): Clarify repo config in second example
2023-11-18 12:43:55 +00:00
Tulili
30ecc4cefd
fix(temp): pin devpod version 2023-11-17 20:34:41 -03:00