zias/omarchy
1
0
Fork 0
mirror of https://github.com/basecamp/omarchy.git synced 2026-02-17 15:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
891 Commits 49 Branches 50 Tags
b150a1f06815a5a5eda75333777a8d298843abff
Commit Graph

891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Heinemeier Hansson
81727a20ce Install everything needed for full Dropbox + split out other potentially flaky installs 2025-07-19 22:43:09 -05:00
David Heinemeier Hansson
aac9e158d1 Migration to add libappindicator-gtk3 2025-07-19 22:25:32 -05:00
David Heinemeier Hansson
b98634d06b Need libappindicator-gtk3 for Dropbox tray icon to work right 2025-07-19 22:24:42 -05:00
David Heinemeier Hansson
309c35c866 Extract shared function 2025-07-19 17:02:52 -05:00
David Heinemeier Hansson
4427c0bb28 Add full screen recording as an option 2025-07-19 16:58:22 -05:00
David Heinemeier Hansson
30b3af58e5 Use same naming convention as new screenshot flow 2025-07-19 16:49:50 -05:00
David Heinemeier Hansson
6b947ffb45 Add satty to the default screenshot flow 2025-07-19 16:49:39 -05:00
David Heinemeier Hansson
f569c4e365 Moving away from SIGUSER2 didn't help with the stacking, so return it 2025-07-19 15:11:52 -05:00
David Heinemeier Hansson
cf71a3f101 Ensure apps started with uwsm stay managed by uwsm on restarts 2025-07-19 15:11:32 -05:00
David Heinemeier Hansson
ceedf474cb Include failed attempt counter and notice when you are locked out for 10 mins 
Closes #229
Co-authored-by: @jhosdev
 2025-07-19 12:34:34 -05:00
David Heinemeier Hansson
178f97a6e3 We don't need the GUI for fcitx5 
The fewer packages the better
 2025-07-18 23:33:08 -05:00
David Heinemeier Hansson
f99277ad71 Remove needless comments 2025-07-18 23:00:42 -05:00
David Heinemeier Hansson
ca69f15709 Not needed 2025-07-18 22:58:48 -05:00
David Heinemeier Hansson
2e874adb50 Add simple screen recordings (#235) 
* Add simple screen recording tool

* Need slurp too
 2025-07-18 22:55:28 -05:00
David Heinemeier Hansson
3b0fd13be1 Set class/title in case we want to do window settings on it 2025-07-18 22:54:42 -05:00
David Heinemeier Hansson
f8a7e1c7eb Finish transition from audio settings GUI to TUI 2025-07-18 22:54:17 -05:00
Roeland
ee5785855a Replace pavucontrol with wiremix (#225) 
Add to install
 2025-07-18 22:40:42 -05:00
David Heinemeier Hansson
7f681c71fb Extra CR 2025-07-18 17:44:18 -07:00
David Heinemeier Hansson
d76d31a5af Make these executable too 2025-07-18 17:43:20 -07:00
David Heinemeier Hansson
3c156ab059 Better error handling and make these full scripts 2025-07-18 17:43:01 -07:00
David Heinemeier Hansson
dbfad74ba3 Better error catching 2025-07-18 17:33:51 -07:00
David Heinemeier Hansson
56e1ba9c5d Merge branch 'master' into dev 2025-07-18 17:18:02 -07:00
David Heinemeier Hansson
68a188d299 Offer community help link 2025-07-18 17:17:42 -07:00
David Heinemeier Hansson
4df7fcb716 Merge pull request #233 from alansikora/alan/setup-fixes 
Setup is failing
 2025-07-18 17:13:10 -07:00
Alan Sikora
913675bd5e Creating plymouth-quit.service.d before running tee 2025-07-18 21:05:38 -03:00
Alan Sikora
56e25bd02c Update docker.sh 2025-07-18 21:05:29 -03:00
David Heinemeier Hansson
2224249901 Merge pull request #223 from ryanrhughes/improve-boot-times 
Improve boot times
v1.5.1 		2025-07-18 14:52:26 -07:00
David Heinemeier Hansson
2b0c56bbb1 Merge pull request #220 from rmacklin/reset-any-stash-conflicts-before-proceeding-in-omarchy-update 
Reset any stash changes before proceeding if there were conflicts
 2025-07-18 14:40:39 -07:00
David Heinemeier Hansson
f388e90d3b Add migration for new Catppuccin Latte theme 2025-07-18 14:35:37 -07:00
David Heinemeier Hansson
cd915557ae Merge pull request #212 from ryanyogan/omarchy-catppuccin-latte-theme 
Omarchy Theme ~ Adds Catppuccin Latte
 2025-07-18 14:32:51 -07:00
David Heinemeier Hansson
96e87d8e7e Minify without quality loss 2025-07-18 14:31:57 -07:00
David Heinemeier Hansson
be751a3dde Merge pull request #223 from ryanrhughes/improve-boot-times 
Improve boot times
 2025-07-18 14:26:27 -07:00
Ryan Yogan
786b0b2205 adds a light pastel background and official btop theme 2025-07-18 10:12:28 -05:00
Ryan Hughes
ced618318d Mask 2025-07-18 05:12:36 -04:00
Ryan Hughes
f5553a8d30 Update 1752797704.sh 
MASK
 2025-07-18 05:11:51 -04:00
Ryan Hughes
e34dbe7d50 Create directories 2025-07-18 04:40:41 -04:00
Ryan Hughes
19d45670ce Change when plymouth is dismissed and prevent docker blocking 2025-07-18 04:37:47 -04:00
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
Ryan Yogan
5252990396 increases the theme menu width for additional characters 2025-07-17 21:49:46 -05:00
Ryan Yogan
276886af8e adds catppuccin logo 2025-07-17 21:35:22 -05:00
Ryan Yogan
0e0741feb7 adds official catppuccin alacritty theme 2025-07-17 21:24:25 -05:00
Richard Macklin
cc0ac314ef Use git pull --autostash in omarchy-update 
This is a minor follow-up to dcc4071979
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
Ryan Yogan
98c269e6d5 adds catppuccin from base catppuccin theme 2025-07-17 21:11:34 -05:00
David Heinemeier Hansson
45b5d3ea47 Merge pull request #209 from basecamp/dev 
Omarchy v1.5.0
v1.5.0 		2025-07-17 20:15:04 -04:00
Ryan Yogan
d200cec03c removes not-needed styles 2025-07-17 19:14:15 -05: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