Richard Macklin
4bb8afde02
Reset any stash changes before proceeding if there were conflicts
...
If the worktree has conflicts after applying the user's changes from the
autostash, we should reset them before proceeding to ensure we are in
a working state. When there are conflicts, git still keeps the stash
entry, so the user will still be able to manually re-pop the stash and
resolve the conflicts after `omarchy-update` has finished.
In the case of conflicts, the output will look something like this (I've
omitted most of the normal `git pull` output, hence the `[...]`):
```
Updating 729cd6a..45b5d3e
Created autostash: 91853c4
Fast-forward
bin/omarchy | 10 +++++++---
[...]
create mode 100644 themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg
Applying autostash resulted in conflicts.
Your changes are safe in the stash.
You can run "git stash pop" or "git stash drop" at any time.
bin/omarchy:65: leftover conflict marker
```
before proceeding with the rest of the `omarchy-update` script from a
clean state. So the user will see 1) that there were conflicts when
applying the autostashed changes, 2) that their changes are still safe
in the stash, and 3) which files (and lines) had conflict markers.
2025-07-17 23:06:25 -07:00
David Heinemeier Hansson
49efa1c3f1
Add third Tokyo Night background
2025-07-17 22:35:02 -07:00
David Heinemeier Hansson
87e55b193b
Merge pull request #215 from rmacklin/use-pull-autostash
...
Use `git pull --autostash` in `omarchy-update`
2025-07-18 00:42:16 -04:00
Richard Macklin
cc0ac314ef
Use git pull --autostash in omarchy-update
...
This is a minor follow-up to dcc40719793d52d43698108a0b0784c2f3b48655
to leverage the `--autostash` flag of `git pull` which does the same
thing we were doing in three separate commands.
This also avoids the possibility of popping something from the stash
that `omarchy-update` didn't actually stash. In other words, if the
initial `git stash` was a no-op (because there were no changes in the
working tree), it's actually not desirable for `omarchy-update` to
`git stash pop` at the end, since that potentially pops something the
user had manually stashed (we only want `omarchy-update` to pop its own
stash entry). Using `--autostash` handles this correctly.
Ref:
https://git-scm.com/docs/git-pull#Documentation/git-pull.txt---autostash
2025-07-17 19:13:35 -07:00
David Heinemeier Hansson
45b5d3ea47
Merge pull request #209 from basecamp/dev
...
Omarchy v1.5.0
2025-07-17 20:15:04 -04:00
David Heinemeier Hansson
94afc734ef
Merge pull request #210 from t0gun/fix-iwd-detection
...
fix: check for iwctl instead of iwd
2025-07-17 20:12:44 -04:00
David Heinemeier Hansson
5c7f1a5037
Add theme picking to the TUI
2025-07-17 17:03:40 -07:00
David Heinemeier Hansson
c76cd8f0c6
Fix paths for sub command invocation
2025-07-17 16:56:13 -07:00
David Heinemeier Hansson
45bab7a92e
Will be set separately
2025-07-17 16:54:19 -07:00
David Heinemeier Hansson
761f08982f
Merge pull request #211 from tahayvr/omarchy-theme-set/dev
...
Add trigger to reload btop when theme changes
2025-07-17 19:44:11 -04:00
David Heinemeier Hansson
39604d2d48
Backgrounds now live in theme folders
2025-07-17 16:34:47 -07:00
tahayvr
ee74a87020
Add trigger to reload btop when theme changes
2025-07-17 16:33:36 -07:00
David Heinemeier Hansson
61c0bfd22b
Seems like pinta can unfortunately also be a bit flaky!
2025-07-17 16:29:06 -07:00
David Heinemeier Hansson
f880531621
Stop wrapping wofi in uwsm for now as it was producing errors
2025-07-17 16:07:33 -07:00
David Heinemeier Hansson
49c38c835f
Add migration for waybar/config.jsonc rename
...
Co-authored-by: @nullndr
Closes #169
2025-07-17 16:00:13 -07:00
David Heinemeier Hansson
7991835576
Use waybar/config.jsonc for syntax highlighting
2025-07-17 15:58:42 -07:00
tobiloba ogundiyan
51c2437f2a
fix broken iwd check by validating iwctl instead
2025-07-17 18:57:37 -04:00
David Heinemeier Hansson
2696fb39da
Protect theme-bg-next from missing background and always start with the first one
2025-07-17 15:34:21 -07:00
David Heinemeier Hansson
296e232151
Just use existing logic for setting theme bg
2025-07-17 15:29:57 -07:00
David Heinemeier Hansson
e2c8e3ccfe
Pull backgrounds into the repo to simplify setup and theme selection
...
This was too complicated for something too remote
2025-07-17 15:16:37 -07:00
David Heinemeier Hansson
86a3c84db9
Consistent command naming scheme for menus too
2025-07-17 15:04:46 -07:00
David Heinemeier Hansson
b9c782d142
Use consistent naming setup and expose add/remove in TUI
2025-07-17 15:02:20 -07:00
David Heinemeier Hansson
ef8df30f01
Add --remove option to fingerprint setup
2025-07-17 14:59:16 -07:00
David Heinemeier Hansson
9467b56be0
Uninstall packages too
2025-07-17 14:53:45 -07:00
David Heinemeier Hansson
68e77daffa
Better setup flow and add --remove option
2025-07-17 14:51:59 -07:00
David Heinemeier Hansson
729cd6a3a2
Merge pull request #171 from icehunt/fido2-setup-script
...
add fido2-setup script
2025-07-17 17:39:09 -04:00
David Heinemeier Hansson
3f01ced913
Fixup migration
2025-07-17 14:32:22 -07:00
David Heinemeier Hansson
89fe64aa23
Merge pull request #206 from Shaps/add-docker-buildx
...
Add docker-buildx package
2025-07-17 17:31:17 -04:00
David Heinemeier Hansson
38417b36e9
Merge branch 'dev' into add-docker-buildx
2025-07-17 17:26:51 -04:00
David Heinemeier Hansson
fd087719a2
Merge pull request #204 from basecamp/light-mode-easy
...
Add light mode
2025-07-17 17:23:31 -04:00
David Heinemeier Hansson
e00c4ad0dc
Link up the theme too
2025-07-17 14:22:01 -07:00
David Heinemeier Hansson
f38420e954
Fit more themes!
2025-07-17 14:18:09 -07:00
David Heinemeier Hansson
6e229feb43
light.mode sounds better!
2025-07-17 14:15:55 -07:00
David Heinemeier Hansson
bb5f6b00e3
Confirm before updating system packages
2025-07-17 14:12:58 -07:00
David Heinemeier Hansson
e9f0239f57
Stash/pop any local changes before pulling updates
...
More user customizations will survive without commits.
2025-07-17 14:12:58 -07:00
David Heinemeier Hansson
25459cb539
Confirm before updating system packages
2025-07-17 09:39:42 -07:00
David Heinemeier Hansson
dcc4071979
Stash/pop any local changes before pulling updates
...
More user customizations will survive without commits.
2025-07-17 09:39:31 -07:00
Andrea Tartaglia
ea7d615eef
add docker-buildx package
2025-07-17 11:46:12 +02:00
Zhephod
86bf311866
add option to opt out of sudo
2025-07-17 02:05:41 -07:00
David Heinemeier Hansson
2235332cb9
Let the themes include backgrounds directly
2025-07-16 22:32:35 -07:00
David Heinemeier Hansson
5170b7a653
Needless
2025-07-16 22:24:32 -07:00
David Heinemeier Hansson
53f77dd267
Add Rose Pine light theme
2025-07-16 22:08:28 -07:00
David Heinemeier Hansson
fb17d91fad
Merge branch 'dev' into light-mode-easy
2025-07-16 21:49:23 -07:00
David Heinemeier Hansson
ebe38078de
Disable uwsmifying wofi launcher until we can fix the issues
2025-07-16 21:49:17 -07:00
David Heinemeier Hansson
6542784559
Make light mode possible via gsettings based off a marker
2025-07-16 21:48:14 -07:00
David Heinemeier Hansson
9a2d8852d3
Kill waybar proper and restart on suspecion that SIGUSR2 is whats causing the stacking bug
2025-07-16 21:13:36 -07:00
David Heinemeier Hansson
4f565b743a
Simpler shebang
2025-07-16 20:15:56 -07:00
David Heinemeier Hansson
c8656cb10f
Merge pull request #201 from basecamp/firewall
...
Enable ufw firewall by default
2025-07-16 20:48:24 -04:00
David Heinemeier Hansson
a735337a59
Turn on ufw-docker
2025-07-16 16:56:40 -07:00
David Heinemeier Hansson
b1c5b420bc
Add migration to enable firewall
2025-07-16 16:47:36 -07:00
