mirror of
https://github.com/outbackdingo/hyprcosmic.git
synced 2026-08-25 07:10:09 +00:00
gitops
c0ae1350f3
HyprCosmic started as a repository beside COSMIC holding a config compiler and a
pile of theme assets, with the two modified components hanging off it. That had
the relationship backwards. COSMIC already has a meta-repo whose whole job is to
name every component and build the desktop from them, so the honest shape for a
fork is to be that meta-repo with the components we changed pointing at our
copies -- not a separate tree that assumes the rest of COSMIC arrived some other
way.
So this merges cosmic-epoch in and repoints exactly two of its 29 submodules:
cosmic-comp -> outbackdingo/hyprcosmic-comp
cosmic-session -> outbackdingo/hyprcosmic-session
The other 27 stay on pop-os. Nothing about them needs to change, and pinning
them to copies we do not maintain would be a promise to keep 27 forks current.
`just build` and `just install` now build and install the whole desktop with our
compositor and session in it, which is what "fork COSMIC" ought to mean. The two
forks still install into /usr/libexec/hyprcosmic rather than over /usr/bin, so a
system that already has COSMIC from its distribution keeps that session on the
greeter's menu alongside this one.
Conflict resolutions worth stating:
.github/workflows/ci.yml upstream's kept as-is. It builds the entire desktop
on Arch through `just sysext`, which is precisely
the check a meta-repo wants and is not made less
useful by forking. Our per-distribution workflow
moved to hyprcosmic.yml beside it, the same way it
did in the compositor fork.
.gitmodules upstream's 29 entries, then two URLs rewritten.
cosmic-comp, cosmic-session
ours. Git reports "no merge base" because they are
unrelated to the pop-os commits recorded here,
which is expected: they are different repositories,
not newer commits of the same one.
.gitignore both sides, plus a note that the two forks are
deliberately no longer ignored.
117 lines
3.6 KiB
Plaintext
117 lines
3.6 KiB
Plaintext
[submodule "cosmic-session"]
|
|
path = cosmic-session
|
|
url = [email protected]:outbackdingo/hyprcosmic-session.git
|
|
branch = master
|
|
[submodule "cosmic-comp"]
|
|
path = cosmic-comp
|
|
url = [email protected]:outbackdingo/hyprcosmic-comp.git
|
|
branch = master
|
|
[submodule "cosmic-panel"]
|
|
path = cosmic-panel
|
|
url = https://github.com/pop-os/cosmic-panel
|
|
branch = master
|
|
[submodule "cosmic-applets"]
|
|
path = cosmic-applets
|
|
url = https://github.com/pop-os/cosmic-applets
|
|
branch = master
|
|
[submodule "cosmic-applibrary"]
|
|
path = cosmic-applibrary
|
|
url = https://github.com/pop-os/cosmic-applibrary
|
|
branch = master
|
|
[submodule "cosmic-launcher"]
|
|
path = cosmic-launcher
|
|
url = https://github.com/pop-os/cosmic-launcher
|
|
branch = master
|
|
[submodule "simple-wrapper"]
|
|
path = simple-wrapper
|
|
url = https://github.com/pop-os/simple-wrapper
|
|
branch = master
|
|
[submodule "cosmic-settings"]
|
|
path = cosmic-settings
|
|
url = https://github.com/pop-os/cosmic-settings
|
|
branch = master
|
|
[submodule "cosmic-settings-daemon"]
|
|
path = cosmic-settings-daemon
|
|
url = https://github.com/pop-os/cosmic-settings-daemon
|
|
branch = master
|
|
[submodule "xdg-desktop-portal-cosmic"]
|
|
path = xdg-desktop-portal-cosmic
|
|
url = https://github.com/pop-os/xdg-desktop-portal-cosmic.git
|
|
branch = master
|
|
[submodule "cosmic-osd"]
|
|
path = cosmic-osd
|
|
url = https://github.com/pop-os/cosmic-osd.git
|
|
branch = master
|
|
[submodule "cosmic-bg"]
|
|
path = cosmic-bg
|
|
url = https://github.com/pop-os/cosmic-bg.git
|
|
branch = master
|
|
[submodule "cosmic-workspaces-epoch"]
|
|
path = cosmic-workspaces-epoch
|
|
url = https://github.com/pop-os/cosmic-workspaces-epoch/
|
|
branch = master
|
|
[submodule "cosmic-notifications"]
|
|
path = cosmic-notifications
|
|
url = https://github.com/pop-os/cosmic-notifications
|
|
branch = master
|
|
[submodule "cosmic-icons"]
|
|
path = cosmic-icons
|
|
url = https://github.com/pop-os/cosmic-icons.git
|
|
branch = master
|
|
[submodule "cosmic-greeter"]
|
|
path = cosmic-greeter
|
|
url = https://github.com/pop-os/cosmic-greeter
|
|
branch = master
|
|
[submodule "cosmic-screenshot"]
|
|
path = cosmic-screenshot
|
|
url = https://github.com/pop-os/cosmic-screenshot
|
|
branch = master
|
|
[submodule "cosmic-edit"]
|
|
path = cosmic-edit
|
|
url = https://github.com/pop-os/cosmic-edit
|
|
branch = master
|
|
[submodule "cosmic-term"]
|
|
path = cosmic-term
|
|
url = https://github.com/pop-os/cosmic-term.git
|
|
branch = master
|
|
[submodule "cosmic-randr"]
|
|
path = cosmic-randr
|
|
url = https://github.com/pop-os/cosmic-randr.git
|
|
branch = master
|
|
[submodule "cosmic-files"]
|
|
path = cosmic-files
|
|
url = https://github.com/pop-os/cosmic-files.git
|
|
branch = master
|
|
[submodule "cosmic-store"]
|
|
path = cosmic-store
|
|
url = https://github.com/pop-os/cosmic-store.git
|
|
branch = master
|
|
[submodule "cosmic-wallpapers"]
|
|
path = cosmic-wallpapers
|
|
url = https://github.com/pop-os/cosmic-wallpapers.git
|
|
branch = master
|
|
[submodule "cosmic-idle"]
|
|
path = cosmic-idle
|
|
url = https://github.com/pop-os/cosmic-idle.git
|
|
branch = master
|
|
[submodule "cosmic-player"]
|
|
path = cosmic-player
|
|
url = https://github.com/pop-os/cosmic-player.git
|
|
branch = master
|
|
[submodule "cosmic-initial-setup"]
|
|
path = cosmic-initial-setup
|
|
url = https://github.com/pop-os/cosmic-initial-setup
|
|
branch = master
|
|
[submodule "pop-launcher"]
|
|
path = pop-launcher
|
|
url = https://github.com/pop-os/launcher.git
|
|
branch = master
|
|
[submodule "cosmic-monitor"]
|
|
path = cosmic-monitor
|
|
url = https://github.com/pop-os/cosmic-monitor.git
|
|
branch = master
|
|
[submodule "cosmic-sound-theme"]
|
|
path = cosmic-sound-theme
|
|
url = https://github.com/pop-os/cosmic-sound-theme.git
|
|
branch = master
|