Skip to content

fix(omarchy): Preserve migration fixes when applying dotfiles - #28

Merged
tyvsmith merged 3 commits into
mainfrom
codex/omarchy-migration-conflicts
Oct 20, 2026
Merged

tyvsmith merged 3 commits into
mainfrom
codex/omarchy-migration-conflicts

Conversation

@tyvsmith

@tyvsmith tyvsmith commented Oct 19, 2026 •

Copy link
Copy Markdown
Owner
  • keep CachyOS CPU-optimized repositories ahead of Omarchy and Arch after configuration refreshes
  • reject malformed pacman marker blocks before the repository hook can remove [omarchy] or duplicate [warpdotdev] after Omarchy reorders repositories
  • preserve Omarchy’s repaired Neovim clipboard provider so applying dotfiles does not restore blocking OSC 52 reads
  • verify malformed-block rejection, repeated application, and the repaired live pacman configuration
  • retain the installed upstream clipboard provider unchanged; tmux clipboard export targets one attached client

Summary by Gitar

  • Display profiles:
    • Added hypr-display-session to switch desktop, gaming, and streaming monitor profiles
    • Streaming selects advertised modes matching Sunshine client FPS via hyprmoncfg
  • Sunshine USB forwarding:
    • Added sunshine-usbip hook attaching a Steam Controller for listed clients
  • Systemd and ScopeBuddy:
    • Added session units and hooks wiring game start and stop into ScopeBuddy launches
  • Neovim clipboard:
    • Routes yanks through tmux buffers and restores unnamedplus over SSH
  • Tests and docs:
    • Added display-session, USB/IP, and pacman hook tests plus documentation

This will update automatically on new commits.

@coderabbitai

coderabbitai Bot commented Oct 19, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration
  • Configuration used: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 6dd360ae-8e4c-45cf-a341-e2643b8bef00
📥 Commits

Reviewing files that changed from the base of the PR and between a2d8db9 and 32b281f.

📒 Files selected for processing: 36
  • docs/display-session.md
  • docs/sunshine-usbip.md
  • home/.chezmoidata/packages.yaml
  • home/.chezmoiignore.tmpl
  • home/dot_config/hypr/hyprland.lua
  • home/dot_config/hypr/monitors.lua
  • home/dot_config/hypr/windows.lua
  • home/dot_config/hyprmoncfg/profiles/desktop.json
  • home/dot_config/hyprmoncfg/profiles/gaming.json
  • home/dot_config/hyprmoncfg/streaming.json
  • home/dot_config/nvim/lua/config/remote_clipboard.lua
  • home/dot_config/omarchy/hooks/pre-refresh-pacman.d/executable_10-custom-repos.sh
  • home/dot_config/pacman/custom-repos-head.conf
  • home/dot_config/scopebuddy/modes/gamescope.conf
  • home/dot_config/scopebuddy/modes/native.conf
  • home/dot_config/scopebuddy/scb.conf
  • home/dot_config/sunshine-usbip.conf
  • home/dot_config/sunshine/apps.json
  • home/dot_config/sunshine/sunshine.conf
  • home/dot_config/systemd/user/app-dev.lizardbyte.app.Sunshine.service.d/cleanup.conf
  • home/dot_config/systemd/user/hypr-display-session.service
  • home/dot_config/systemd/user/hyprmoncfgd.service.d/session.conf
  • home/dot_local/bin/executable_hypr-display-session
  • home/dot_local/bin/executable_sunshine-usbip
  • home/run_onchange_20-configure-pacman-repos.sh.tmpl
  • home/run_onchange_51-configure-hypr-display-session.sh.tmpl
  • home/run_onchange_52-configure-sunshine-usbip.sh.tmpl
  • tests/chezmoi/test_source_root.py
  • tests/display-session/test_daemon.py
  • tests/display-session/test_scopebuddy.py
  • tests/display-session/test_session.py
  • tests/display-session/test_units.py
  • tests/hypr/config.lua
  • tests/pacman/test_custom_repos.py
  • tests/sunshine-usbip/test_hooks.py
  • tests/sunshine-usbip/test_setup.py
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Debugging is twice as hard as writing the code in the first place. Therefore, if you write the code as cleverly as possible, you are, by definition, not smart enough to debug it. - Brian Kernighan |
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
  \
   \   (\__/)
       (•ㅅ•)
       /   づ
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…#29)

* feat(gaming): Coordinate display profiles and optional USB forwarding

* fix(hypr): Default Steam Big Picture to fullscreen
@gitar-bot

gitar-bot Bot commented Oct 20, 2026

Copy link
Copy Markdown
Code Review ✅ Approved

🔴 High risk · The new passwordless sudoers rule allows arbitrary USB/IP attach and detach arguments, which could let the user manipulate system USB devices as root.

Preserves pacman repository ordering and Omarchy's repaired Neovim clipboard provider across dotfile application, with malformed marker-block rejection and repeated-application checks. No issues found.

Verification

Rules No rules evaluated

Functional validation Not enabled

Set up

For more verification details, comment gitar display:verbose.

Options

Auto-apply is off → Gitar will not commit updates to this branch.
Display: compact → Showing compact verification results.

Comment with these commands to change the behavior for this request:

Auto-apply Compact
gitar auto-apply:on         
gitar display:verbose         

Was this helpful? React with 👍 / 👎 | Powered by Gitar — free for open source

@tyvsmith
tyvsmith marked this pull request as ready for review October 20, 2026 22:45
Copilot AI balanced review requested due to automatic review settings October 20, 2026 22:45

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@tyvsmith
tyvsmith merged commit bcbd967 into main Oct 20, 2026
6 of 7 checks passed
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.

2 participants