modules/hyprland: init

[PeDro0210]

adds support for single file hypr.conf

[zimward]

btw: for squashing you may want to read this https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

[zimward]

Suggested change

	"--config" = config."hypr.conf".path;
	"--config" = toString config."hypr.conf".path;

[Mrid22]

Wait is this just for hyprland or all hypr* ecosystem tools like hypridle and hyprpaper?

[zimward]

Wait is this just for hyprland or all hypr* ecosystem tools like hypridle and hyprpaper?

thats just a basic wrapper around hyprland without structured settings even

[Mrid22]

Wait is this just for hyprland or all hypr* ecosystem tools like hypridle and hyprpaper?

thats just a basic wrapper around hyprland without structured settings even

then shouldnt it be called hyprland instead of hypr?

[PeDro0210]

Wait is this just for hyprland or all hypr* ecosystem tools like hypridle and hyprpaper?

thats just a basic wrapper around hyprland without structured settings even

then shouldnt it be called hyprland instead of hypr?

The name is just cause' what's the name of the dotfile for hyprland which is called hypr

[zimward]

yeah i guess it would be better to name it hyprland given thats the package, as changeing it later would lead to ppl config breaking

[PeDro0210]

yeah i guess it would be better to name it hyprland given thats the package, as changeing it later would lead to ppl config breaking

Good point, I'll change it in a bit and then do the squash cause ik that hype x11 exists but I didn't want it to take in mind

[PeDro0210]

there it is, with the squashing :D

[Mrid22]

quite a large diff for just one module dont you think? can i see the commit history somewhere?

[PeDro0210]

@Mrid22 by accident I sync the main branch for the wrapper in mine

[PeDro0210]

I can another pr if any if u want. One a bit cleaner.

[Mrid22]

I can another pr if any if u want. One a bit cleaner.

I guess this is ultimately up to @zimward but heres what i would do if i were you:

1. On your github, go to your fork and select sync fork, then make sure to not hit the button that says drop commits, hit the other one, it should merge this repo with yours in a single commit
2. On your computer, go to your local copy of the branch and type in git checkout main, this will put you on the main branch of your fork, Delete the commit you have for hyprland
3. If you go back to your github, it should say the main branch is synced
4. back in the terminal, run git checkout hypr-wrapper and open up lazygit
5. press 4 to go to the commits section, hit v to go into select mode, and keep going down till you've selected all the 34 commits that you added, then hit s to squash the commits, hit r to rename to "modules/hyprland: init", then exit lazygit with q and run git push --force, this will overwrite the commit history of that branch and replace it with a single commit ( the s stands for squash btw)
6. Then run git checkout main to go to the main branch and open up lazygit
7. Select all 34 commits you have in that branch and hit d to drop/delete them ( don't worry they're still in the other branch ). Again run git push --force to remove those commits from your github as well ( --force should ONLY be used when overwriting history)
8. you now have something similar to what you should use every time you want to contribute, keep the main branch so you don't get left behind trying to make changes, and for any changes you do make, make them in a new branch which can be deleted once that PR is merged
9. Close this PR and open one from that branch

[PeDro0210]

I can another pr if any if u want. One a bit cleaner.

I guess this is ultimately up to @zimward but heres what i would do if i were you:

1. On your github, go to your fork and select sync fork, then make sure to not hit the button that says drop commits, hit the other one, it should merge this repo with yours in a single commit

2. On your computer, go to your local copy of the branch and type in git checkout main, this will put you on the main branch of your fork, Delete the commit you have for hyprland

3. If you go back to your github, it should say the main branch is synced

4. back in the terminal, run git checkout hypr-wrapper and open up lazygit

5. press 4 to go to the commits section, hit v to go into select mode, and keep going down till you've selected all the 34 commits that you added, then hit s to squash the commits, hit r to rename to "modules/hyprland: init", then exit lazygit with q and run git push --force, this will overwrite the commit history of that branch and replace it with a single commit ( the s stands for squash btw)

6. Then run git checkout main to go to the main branch and open up lazygit

7. Select all 34 commits you have in that branch and hit d to drop/delete them ( don't worry they're still in the other branch ). Again run git push --force to remove those commits from your github as well ( --force should ONLY be used when overwriting history)

8. you now have something similar to what you should use every time you want to contribute, keep the main branch so you don't get left behind trying to make changes, and for any changes you do make, make them in a new branch which can be deleted once that PR is merged

9. Close this PR and open one from that branch

Yeah I might do that, but for the moment I'll wait for @zimward to check this PR, after all the thread might be useful for someone some day, after that I'll create the other or with the instructions u gave me

[zimward]

yeah since you apparently merged main back into this in a way that duplicates all changes merged since whenever you check the repo out its essentially unmergeable the way it is rn.

[PeDro0210]

@zimward okay okay, I create another PR in this case :D, sorry for the trouble btw :(

[zimward]

@zimward okay okay, I create another PR in this case :D, sorry for the trouble btw :(

don't worry. also one git tip: when working on PRs use git rebase to update to the current state of the main branch instead of merges. that way your commits just get moved to the top and don't cause these kinds of issues

[PeDro0210]

Here's the new PR with just the hyprland module: #138 :D.