Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce to Waybar #386

Merged
merged 1 commit into from
Feb 5, 2024
Merged

Introduce to Waybar #386

merged 1 commit into from
Feb 5, 2024

Conversation

Nerox9
Copy link
Contributor

@Nerox9 Nerox9 commented Dec 1, 2023

Description of changes

Waybar configuration modified based on the default bar configuration and launchers added.
Pulseaudio, network and battery/power adapter icons implemented.
Weston and waybar launchers are unified and name section added.

Checklist for things done

  • Summary of the proposed changes in the PR description
  • More detailed description in the commit message(s)
  • Commits are squashed into relevant entities - avoid a lot of minimal dev time commits in the PR
  • Contribution guidelines followed
  • Ghaf documentation updated with the commit - https://tiiuae.github.io/ghaf/
  • PR linked to architecture documentation and requirement(s) (ticket id)
  • Test procedure described (or includes tests). Select one or more:
    • Tested on Lenovo X1 x86_64
    • [-] Tested on Jetson Orin NX or AGX aarch64
    • [-] Tested on Polarfire riscv64
  • Author has run nix flake check --accept-flake-config --allow-import-from-derivation and it passes
  • All automatic Github Action checks pass - see actions
  • Author has added reviewers and removed PR draft status

Testing

  1. Uncomment to set the compositor as "labwc" here.
  2. Rebuild with the change.
  3. Flash the image and boot.

@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 1, 2023 12:31 — with GitHub Actions Inactive
@Nerox9 Nerox9 had a problem deploying to external-build-workflow December 1, 2023 12:31 — with GitHub Actions Failure
@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 1, 2023 12:34 — with GitHub Actions Inactive
@Nerox9 Nerox9 had a problem deploying to external-build-workflow December 1, 2023 12:35 — with GitHub Actions Failure
@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 1, 2023 12:35 — with GitHub Actions Inactive
@Nerox9 Nerox9 had a problem deploying to external-build-workflow December 1, 2023 12:36 — with GitHub Actions Failure
@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 1, 2023 12:38 — with GitHub Actions Inactive
@Nerox9 Nerox9 had a problem deploying to external-build-workflow December 1, 2023 12:38 — with GitHub Actions Failure
@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 1, 2023 12:47 — with GitHub Actions Inactive
@Nerox9 Nerox9 had a problem deploying to external-build-workflow December 1, 2023 12:47 — with GitHub Actions Failure
@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 1, 2023 12:53 — with GitHub Actions Inactive
@Nerox9 Nerox9 had a problem deploying to external-build-workflow December 1, 2023 12:53 — with GitHub Actions Failure
@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 1, 2023 14:49 — with GitHub Actions Inactive
@Nerox9 Nerox9 temporarily deployed to external-build-workflow December 1, 2023 14:50 — with GitHub Actions Inactive
@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 4, 2023 08:42 — with GitHub Actions Inactive
@Nerox9 Nerox9 temporarily deployed to external-build-workflow December 4, 2023 08:42 — with GitHub Actions Inactive
@Nerox9 Nerox9 temporarily deployed to internal-build-workflow December 4, 2023 09:03 — with GitHub Actions Inactive
@Nerox9 Nerox9 had a problem deploying to external-build-workflow December 4, 2023 09:03 — with GitHub Actions Failure
vilvo

This comment was marked as outdated.

@leivos-unikie leivos-unikie added the Tested on Lenovo X1 Carbon This PR has been tested on Lenovo X1 Carbon label Jan 10, 2024
@leivos-unikie
Copy link
Contributor

None of the demo apps launch by clicking their icons.

Tried to launch zathura also from command line with the command found in /etc/waybar/config
Not launching.

@leivos-unikie
Copy link
Contributor

Tested again. Now apps launch except gala.

@leivos-unikie
Copy link
Contributor

Now all apps launch.

modules/graphics/fonts.nix Outdated Show resolved Hide resolved
Copy link
Contributor

@vilvo vilvo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nix inherit related comment.
Testing-section of the PR requires improvement before I know who to test it.

  • "Please note that it works with display as "wayland-0" in waypipe only in guivm.nix" <- what does this mean? The PR has no changes to guivm.nix and the main-branch guivm.nix has no clear indication on what to change to achieve this. Maybe the link is outdated?

Proposal on the PR Testing-section improvements:

  1. Detailed instruction to what exactly to change in the guivm.nix - use links to main branch (for example) and example of the exact setting to set - e.g.
    waypipe-display = wayland-0 (<- is non-sense but hope you get the idea)
  2. Detailed instruction to what to change in the guivm for labwc. For example,
    profiles.graphics.compositor = "labwc"
  3. Rebuild with the settings changes from steps 1. and 2.
  4. Flash the image to SSD and boot.

Waybar configuration modified based on the default bar configuration and launchers added.
Pulseaudio is added to guivm.
Nmcli is used to get the network connection data in wifi-signal-strength script and nm-launcher connection structure is copied.
Weston and waybar launchers are unified and name section added.

Nerdfonts FiraCode is added.
All the style and configuration files are created in weston.config.nix.

Compositor and waypipe display name must be overriden as in comments in guivm.nix to use waybar properly.

Signed-off-by: Berk Arslan <[email protected]>
@Nerox9
Copy link
Contributor Author

Nerox9 commented Feb 2, 2024

Minor nix inherit related comment. Testing-section of the PR requires improvement before I know who to test it.

* "Please note that it works with display as "wayland-0" in waypipe only in [guivm.nix](https://github.com/tiiuae/ghaf/pull/386/files#diff-48f3927dbfa0f525b6dd5c7bc57cc323d0b54bdbd60cf71264f84e0714cdd5f5)" <- what does this mean? The PR has no changes to `guivm.nix` and the [`main`-branch `guivm.nix`](https://github.com/tiiuae/ghaf/blob/main/modules/virtualization/microvm/guivm.nix) has no clear indication on what to change to achieve this. Maybe the link is outdated?

Proposal on the PR Testing-section improvements:

1. Detailed instruction to what exactly to change in the `guivm.nix` - use links to main branch ([for example](https://github.com/tiiuae/ghaf/blob/main/modules/virtualization/microvm/guivm.nix#L2)) and example of the exact setting to set - e.g.
   `waypipe-display = wayland-0` (<- is non-sense but hope you get the idea)

2. Detailed instruction to what to change in the guivm for labwc. For example,
   `profiles.graphics.compositor = "labwc"`

3. Rebuild with the settings changes from steps 1. and 2.

4. Flash the image to SSD and boot.

The display name issue is fixed by the main branch update. The comment of testing is replaced with the steps.

@brianmcgillion brianmcgillion merged commit 8c4baa7 into tiiuae:main Feb 5, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tested on Lenovo X1 Carbon This PR has been tested on Lenovo X1 Carbon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants