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

Add file or directory tile to Dock persistent others #950

Merged
merged 1 commit into from
May 20, 2024

Conversation

rmgpinto
Copy link
Contributor

Added file or directory tile to Dock persistent others.
This will either expand directories or open files directly.

@rmgpinto rmgpinto force-pushed the persistent-others-file-directory-tile branch from 0a1571a to 9f5a59f Compare May 14, 2024 08:07
@rmgpinto rmgpinto force-pushed the persistent-others-file-directory-tile branch 2 times, most recently from 51186d6 to 9f56f18 Compare May 15, 2024 06:57
@rmgpinto
Copy link
Contributor Author

@Samasaur1 or @Enzime PR #928 doesn't work, I'm trying to fix it.
However, the tests fail. The change is small but I'm not getting any clue about the error in the logs:

Did not find content from /nix/store/4r7rk4742d0kpjivcqfksvnrh0apc6wb-system-defaults-write/activate-user.txt in /nix/store/fx1rr7h100mavkwax300ckkyw0m72v9r-darwin-system-23.11pre558482.8a4282c38b6c+darwin4.7a694d1/activate-user

Are you able to help? Thanks

@Samasaur1
Copy link
Contributor

Samasaur1 commented May 16, 2024

It's probably a similar error to last time. What I did to figure that out was to checkout the PR locally and run the tests, so that you have both of those files. Then I diffed them to see what was actually missing

@rmgpinto
Copy link
Contributor Author

@Samasaur1 I am trying to run the PR locally, but it doesn't generate the file active-user.
That's what I get in the logs.

@Samasaur1
Copy link
Contributor

@rmgpinto What do you mean it "doesn't generate"? The logs give you the paths to two files in the Nix store — those are what I'm talking about

@Samasaur1
Copy link
Contributor

You probably want to

opendiff /nix/store/4r7rk4742d0kpjivcqfksvnrh0apc6wb-system-defaults-write/activate-user.txt /nix/store/fx1rr7h100mavkwax300ckkyw0m72v9r-darwin-system-23.11pre558482.8a4282c38b6c+darwin4.7a694d1/activate-user

Find the block that is almost exactly the same. It should be pretty clear what the problem is

@rmgpinto rmgpinto force-pushed the persistent-others-file-directory-tile branch 6 times, most recently from 209978a to 17e0f06 Compare May 16, 2024 07:29
@rmgpinto
Copy link
Contributor Author

@Samasaur1 thanks, it worked now.
It's ready to merge.

modules/system/defaults/dock.nix Outdated Show resolved Hide resolved
@rmgpinto rmgpinto force-pushed the persistent-others-file-directory-tile branch 2 times, most recently from 6c74133 to 2b41918 Compare May 17, 2024 05:57
@rmgpinto
Copy link
Contributor Author

@Enzime ready with your proposed changes. Thanks

@rmgpinto rmgpinto requested a review from Enzime May 17, 2024 15:32
@Enzime
Copy link
Collaborator

Enzime commented May 20, 2024

Can you rebase over the latest master?

Everything else looks good to me 👍

@rmgpinto rmgpinto force-pushed the persistent-others-file-directory-tile branch 3 times, most recently from a1055c2 to 93913d1 Compare May 20, 2024 11:38
@rmgpinto
Copy link
Contributor Author

done @Enzime

Copy link
Collaborator

@Enzime Enzime left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks for the contribution

@Enzime Enzime merged commit 8bf083c into LnL7:master May 20, 2024
6 checks passed
@rmgpinto rmgpinto deleted the persistent-others-file-directory-tile branch May 20, 2024 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants