38 Commits

Author SHA1 Message Date
178f97a6e3 We don't need the GUI for fcitx5
The fewer packages the better
2025-07-18 23:33:08 -05:00
f99277ad71 Remove needless comments 2025-07-18 23:00:42 -05:00
ca69f15709 Not needed 2025-07-18 22:58:48 -05:00
2e874adb50 Add simple screen recordings (#235)
* Add simple screen recording tool

* Need slurp too
2025-07-18 22:55:28 -05:00
3b0fd13be1 Set class/title in case we want to do window settings on it 2025-07-18 22:54:42 -05:00
f8a7e1c7eb Finish transition from audio settings GUI to TUI 2025-07-18 22:54:17 -05:00
ee5785855a Replace pavucontrol with wiremix (#225)
Add to install
2025-07-18 22:40:42 -05:00
7f681c71fb Extra CR 2025-07-18 17:44:18 -07:00
d76d31a5af Make these executable too 2025-07-18 17:43:20 -07:00
3c156ab059 Better error handling and make these full scripts 2025-07-18 17:43:01 -07:00
dbfad74ba3 Better error catching 2025-07-18 17:33:51 -07:00
56e1ba9c5d Merge branch 'master' into dev 2025-07-18 17:18:02 -07:00
68a188d299 Offer community help link 2025-07-18 17:17:42 -07:00
4df7fcb716 Merge pull request #233 from alansikora/alan/setup-fixes
Setup is failing
2025-07-18 17:13:10 -07:00
913675bd5e Creating plymouth-quit.service.d before running tee 2025-07-18 21:05:38 -03:00
56e25bd02c Update docker.sh 2025-07-18 21:05:29 -03:00
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
f388e90d3b Add migration for new Catppuccin Latte theme 2025-07-18 14:35:37 -07:00
cd915557ae Merge pull request #212 from ryanyogan/omarchy-catppuccin-latte-theme
Omarchy Theme ~ Adds Catppuccin Latte
2025-07-18 14:32:51 -07:00
96e87d8e7e Minify without quality loss 2025-07-18 14:31:57 -07:00
be751a3dde Merge pull request #223 from ryanrhughes/improve-boot-times
Improve boot times
2025-07-18 14:26:27 -07:00
786b0b2205 adds a light pastel background and official btop theme 2025-07-18 10:12:28 -05:00
ced618318d Mask 2025-07-18 05:12:36 -04:00
f5553a8d30 Update 1752797704.sh
MASK
2025-07-18 05:11:51 -04:00
e34dbe7d50 Create directories 2025-07-18 04:40:41 -04:00
19d45670ce Change when plymouth is dismissed and prevent docker blocking 2025-07-18 04:37:47 -04:00
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
49efa1c3f1 Add third Tokyo Night background 2025-07-17 22:35:02 -07:00
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
5252990396 increases the theme menu width for additional characters 2025-07-17 21:49:46 -05:00
276886af8e adds catppuccin logo 2025-07-17 21:35:22 -05:00
0e0741feb7 adds official catppuccin alacritty theme 2025-07-17 21:24:25 -05:00
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
98c269e6d5 adds catppuccin from base catppuccin theme 2025-07-17 21:11:34 -05:00
d200cec03c removes not-needed styles 2025-07-17 19:14:15 -05:00
2bcff1662b removes personal neovim configs 2025-07-17 18:50:58 -05:00
4097582572 Merge branch 'basecamp:dev' into dev 2025-07-17 18:36:03 -05:00
03a541a9a2 [THEME] // Adds initial catppuccin-latte base styles 2025-07-17 17:11:34 -05:00
29 changed files with 290 additions and 18 deletions

View File

@ -2,7 +2,7 @@
Name=Neovim Name=Neovim
GenericName=Text Editor GenericName=Text Editor
Comment=Edit text files Comment=Edit text files
Exec=alacritty -e nvim -- %F Exec=alacritty --class=nvim --title=nvim -e nvim -- %F
Terminal=false Terminal=false
Type=Application Type=Application
Keywords=Text;editor; Keywords=Text;editor;

View File

@ -0,0 +1,7 @@
[Desktop Entry]
Name=Audio Settings
Comment=Using Wiremix
Exec=alacritty --class=Wiremix --title=Wiremix -e wiremix
Icon=audio-card
Type=Application
Terminal=false

View File

@ -1,16 +1,14 @@
#!/bin/bash #!/bin/bash
# Power menu for Omarchy
# Provides power off, restart, and sleep options
# Function to show power menu. The first characters are invisible sort keys.
show_power_menu() { show_power_menu() {
# The first characters are invisible sort keys.
local menu_options="\u200B Lock local menu_options="\u200B Lock
\u200C󰤄 Suspend \u200C󰤄 Suspend
\u200D Relaunch \u200D Relaunch
\u2060󰜉 Restart \u2060󰜉 Restart
\u2063󰐥 Shutdown" \u2063󰐥 Shutdown"
local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 150 --height 195 -O alphabetical --style ~/.config/wofi/select.css)
local selection=$(echo -e "$menu_options" | wofi --show dmenu --width 150 --height 195 -O alphabetical --style ~/.config/wofi/select.css)
case "$selection" in case "$selection" in
*Lock*) hyprlock ;; *Lock*) hyprlock ;;
@ -21,5 +19,4 @@ show_power_menu() {
esac esac
} }
# Main execution
show_power_menu show_power_menu

14
bin/omarchy-screenrecord Executable file
View File

@ -0,0 +1,14 @@
#!/bin/bash
if pgrep -x wl-screenrec >/dev/null; then
pkill -x wl-screenrec
notify-send "Screen recording saved to ~/Videos" -t 2000
else
region=$(slurp) || exit 1
notify-send "Screen recording starting..." -t 1000
sleep 1
wl-screenrec \
-g "$region" \
-f "$HOME/Videos/screen-recording-$(date +'%Y-%m-%d_%H-%M-%S').mp4" \
--ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart"
fi

View File

@ -22,7 +22,7 @@ mapfile -t themes < <(
selection=$(printf '%s\n' "${themes[@]}" | wofi \ selection=$(printf '%s\n' "${themes[@]}" | wofi \
--show dmenu \ --show dmenu \
--allow-markup \ --allow-markup \
--width 150 \ --width 200 \
--height 400 \ --height 400 \
-O alphabetical \ -O alphabetical \
--style ~/.config/wofi/select.css 2>/dev/null) --style ~/.config/wofi/select.css 2>/dev/null)

View File

@ -11,9 +11,8 @@ else
fi fi
# Get the latest while trying to preserve any modifications # Get the latest while trying to preserve any modifications
git stash git pull --autostash
git pull git diff --check || git reset --merge
git stash pop
# Run any pending migrations # Run any pending migrations
for file in migrations/*.sh; do for file in migrations/*.sh; do

2
boot.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/bin/bash
ascii_art=' ▄██████▄ ▄▄▄▄███▄▄▄▄ ▄████████ ▄████████ ▄████████ ▄█ █▄ ▄██ ▄ ascii_art=' ▄██████▄ ▄▄▄▄███▄▄▄▄ ▄████████ ▄████████ ▄████████ ▄█ █▄ ▄██ ▄
███ ███ ▄██▀▀▀███▀▀▀██▄ ███ ███ ███ ███ ███ ███ ███ ███ ███ ██▄ ███ ███ ▄██▀▀▀███▀▀▀██▄ ███ ███ ███ ███ ███ ███ ███ ███ ███ ██▄
███ ███ ███ ███ ███ ███ ███ ███ ███ ███ █▀ ███ ███ ███▄▄▄███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ █▀ ███ ███ ███▄▄▄███

View File

@ -96,7 +96,7 @@
}, },
"pulseaudio": { "pulseaudio": {
"format": "{icon}", "format": "{icon}",
"on-click": "pavucontrol", "on-click": "alacritty --class=Wiremix -e wiremix",
"on-click-right": "pamixer -t", "on-click-right": "pamixer -t",
"tooltip-format": "Playing at {volume}%", "tooltip-format": "Playing at {volume}%",
"scroll-step": 5, "scroll-step": 5,

View File

@ -28,5 +28,8 @@ bind = , PRINT, exec, hyprshot -m region
bind = SHIFT, PRINT, exec, hyprshot -m window bind = SHIFT, PRINT, exec, hyprshot -m window
bind = CTRL, PRINT, exec, hyprshot -m output bind = CTRL, PRINT, exec, hyprshot -m output
# Screenshots
bind = ALT, PRINT, exec, omarchy-screenrecord
# Color picker # Color picker
bind = SUPER, PRINT, exec, hyprpicker -a bind = SUPER, PRINT, exec, hyprpicker -a

View File

@ -5,10 +5,10 @@ windowrule = suppressevent maximize, class:.*
windowrule = tile, class:^(Chromium)$ windowrule = tile, class:^(Chromium)$
# Float and center settings and previews # Float and center settings and previews
windowrule = float, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$ windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer)$ windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer)$
windowrule = size 645 350, class:Omarchy windowrule = size 645 350, class:Omarchy
windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$ windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
# Float and center file pickers # Float and center file pickers
windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save) windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)

10
install.sh Normal file → Executable file
View File

@ -1,8 +1,16 @@
#!/bin/bash
# Exit immediately if a command exits with a non-zero status # Exit immediately if a command exits with a non-zero status
set -e set -e
# Give people a chance to retry running the installation # Give people a chance to retry running the installation
trap 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR catch_errors() {
echo -e "\n\e[31mOmarchy installation failed!\e[0m"
echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
echo "Get help from the community: https://discord.gg/tXFUdasqhY"
}
trap catch_errors ERR
# Install everything # Install everything
for f in ~/.local/share/omarchy/install/*.sh; do for f in ~/.local/share/omarchy/install/*.sh; do

View File

@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
yay -S --noconfirm --needed \ yay -S --noconfirm --needed \
brightnessctl playerctl pamixer pavucontrol wireplumber \ brightnessctl playerctl pamixer wiremix wireplumber \
fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \ fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \
nautilus sushi ffmpegthumbnailer \ nautilus sushi ffmpegthumbnailer \
slurp wl-screenrec \
mpv evince imv \ mpv evince imv \
chromium chromium

View File

@ -13,6 +13,7 @@ sudo systemctl enable docker
sudo usermod -aG docker ${USER} sudo usermod -aG docker ${USER}
# Prevent Docker from preventing boot for network-online.target # Prevent Docker from preventing boot for network-online.target
sudo mkdir -p /etc/systemd/system/docker.service.d
sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF' sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
[Unit] [Unit]
DefaultDependencies=no DefaultDependencies=no

View File

@ -110,6 +110,7 @@ WantedBy=graphical.target
EOF EOF
# Make plymouth remain until graphical.target # Make plymouth remain until graphical.target
sudo mkdir -p /etc/systemd/system/plymouth-quit.service.d
sudo tee /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf <<'EOF' sudo tee /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf <<'EOF'
[Unit] [Unit]
After=multi-user.target After=multi-user.target

4
migrations/1752874371.sh Normal file
View File

@ -0,0 +1,4 @@
echo "Add Catppuccin Latte light theme"
if [[ ! -L "~/.config/omarchy/themes/catppuccin-latte" ]]; then
ln -snf ~/.local/share/omarchy/themes/catppuccin-latte ~/.config/omarchy/themes/
fi

2
migrations/1752885858.sh Normal file
View File

@ -0,0 +1,2 @@
echo "Install slurp + wl-screenrec for new ALT+PrintScreen screen recorder"
yay -S --noconfirm --needed slurp wl-screenrec

9
migrations/1752896442.sh Normal file
View File

@ -0,0 +1,9 @@
echo "Replace volume control GUI with a TUI"
if ! command -v wiremix &>/dev/null; then
yay -S --noconfirm --needed wiremix
yay -Rns --noconfirm pavucontrol
omarchy-refresh-applications
omarchy-refresh-waybar
fi

4
migrations/1752897642.sh Normal file
View File

@ -0,0 +1,4 @@
echo "Remove needless fcitx5-configtool package"
if command -v fcitx5-configtool &>/dev/null; then
yay -Rns --noconfirm fcitx5-configtool
fi

View File

@ -0,0 +1,67 @@
# https://raw.githubusercontent.com/catppuccin/alacritty/main/catppuccin-latte.toml
[colors.primary]
background = "#eff1f5"
foreground = "#4c4f69"
dim_foreground = "#8c8fa1"
bright_foreground = "#4c4f69"
[colors.cursor]
text = "#eff1f5"
cursor = "#dc8a78"
[colors.vi_mode_cursor]
text = "#eff1f5"
cursor = "#7287fd"
[colors.search.matches]
foreground = "#eff1f5"
background = "#6c6f85"
[colors.search.focused_match]
foreground = "#eff1f5"
background = "#40a02b"
[colors.footer_bar]
foreground = "#eff1f5"
background = "#6c6f85"
[colors.hints.start]
foreground = "#eff1f5"
background = "#df8e1d"
[colors.hints.end]
foreground = "#eff1f5"
background = "#6c6f85"
[colors.selection]
text = "#eff1f5"
background = "#dc8a78"
[colors.normal]
black = "#bcc0cc"
red = "#d20f39"
green = "#40a02b"
yellow = "#df8e1d"
blue = "#1e66f5"
magenta = "#ea76cb"
cyan = "#179299"
white = "#5c5f77"
[colors.bright]
black = "#acb0be"
red = "#d20f39"
green = "#40a02b"
yellow = "#df8e1d"
blue = "#1e66f5"
magenta = "#ea76cb"
cyan = "#179299"
white = "#6c6f85"
[[colors.indexed_colors]]
index = 16
color = "#fe640b"
[[colors.indexed_colors]]
index = 17
color = "#dc8a78"

Binary file not shown.

After

Width:  |  Height:  |  Size: 652 KiB

View File

@ -0,0 +1,84 @@
# https://github.com/catppuccin/btop/blob/main/themes/catppuccin_latte.theme
# Main background, empty for terminal default, need to be empty if you want transparent background
theme[main_bg]="#eff1f5"
# Main text color
theme[main_fg]="#4c4f69"
# Title color for boxes
theme[title]="#4c4f69"
# Highlight color for keyboard shortcuts
theme[hi_fg]="#1e66f5"
# Background color of selected item in processes box
theme[selected_bg]="#bcc0cc"
# Foreground color of selected item in processes box
theme[selected_fg]="#1e66f5"
# Color of inactive/disabled text
theme[inactive_fg]="#8c8fa1"
# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
theme[graph_text]="#dc8a78"
# Background color of the percentage meters
theme[meter_bg]="#bcc0cc"
# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
theme[proc_misc]="#dc8a78"
# CPU, Memory, Network, Proc box outline colors
theme[cpu_box]="#8839ef" #Mauve
theme[mem_box]="#40a02b" #Green
theme[net_box]="#e64553" #Maroon
theme[proc_box]="#1e66f5" #Blue
# Box divider line and small boxes line color
theme[div_line]="#9ca0b0"
# Temperature graph color (Green -> Yellow -> Red)
theme[temp_start]="#40a02b"
theme[temp_mid]="#df8e1d"
theme[temp_end]="#d20f39"
# CPU graph colors (Teal -> Lavender)
theme[cpu_start]="#179299"
theme[cpu_mid]="#209fb5"
theme[cpu_end]="#7287fd"
# Mem/Disk free meter (Mauve -> Lavender -> Blue)
theme[free_start]="#8839ef"
theme[free_mid]="#7287fd"
theme[free_end]="#1e66f5"
# Mem/Disk cached meter (Sapphire -> Lavender)
theme[cached_start]="#209fb5"
theme[cached_mid]="#1e66f5"
theme[cached_end]="#7287fd"
# Mem/Disk available meter (Peach -> Red)
theme[available_start]="#fe640b"
theme[available_mid]="#e64553"
theme[available_end]="#d20f39"
# Mem/Disk used meter (Green -> Sky)
theme[used_start]="#40a02b"
theme[used_mid]="#179299"
theme[used_end]="#04a5e5"
# Download graph colors (Peach -> Red)
theme[download_start]="#fe640b"
theme[download_mid]="#e64553"
theme[download_end]="#d20f39"
# Upload graph colors (Green -> Sky)
theme[upload_start]="#40a02b"
theme[upload_mid]="#179299"
theme[upload_end]="#04a5e5"
# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
theme[process_start]="#209fb5"
theme[process_mid]="#7287fd"
theme[process_end]="#8839ef"

View File

@ -0,0 +1,8 @@
# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
$latte_blue = rgb(1e66f5)
general {
col.active_border = $latte_blue
}

View File

@ -0,0 +1,9 @@
$color = rgba(239,241,245,1.0) # base
$inner_color = rgba(239,241,245,0.8) # slightly transparent base
$outer_color = rgba(30,102,245,1.0) # blue
$font_color = rgba(76,79,105,1.0) # text
$placeholder_color = rgba(204,208,218,0.6) # overlay0 (muted gray-blue)
$check_color = rgba(4,165,229,1.0) # cyan

View File

@ -0,0 +1 @@
# This will set "prefer-light" and use "Adwaita" as the theme

View File

@ -0,0 +1,24 @@
# Catppuccin Latte mako notification theme
text-color=#4c4f69 # text
border-color=#dce0e8 # crust
background-color=#eff1f5 # base
width=420
height=110
padding=10
border-size=2
font=Liberation Sans 11
anchor=top-right
outer-margin=20
default-timeout=5000
max-icon-size=32
[app-name=Spotify]
invisible=1
[mode=do-not-disturb]
invisible=true
[mode=do-not-disturb app-name=notify-send]
invisible=false

View File

@ -0,0 +1,19 @@
return {
{
"catppuccin/nvim",
name = "catppuccin",
priority = 1000,
config = function()
require("catppuccin").setup({
flavour = "latte", -- other options: "mocha", "frappe", "macchiato"
})
vim.cmd.colorscheme("catppuccin-latte")
end,
},
{
"LazyVim/LazyVim",
opts = {
colorscheme = "catppuccin-latte",
},
},
}

View File

@ -0,0 +1,4 @@
@define-color foreground #4c4f69; /* text */
@define-color background #eff1f5; /* base */
@define-color border #dce0e8; /* crust */
@define-color accent #1e66f5; /* blue */

View File

@ -0,0 +1,4 @@
@define-color selected-text #1e66f5; /* blue */
@define-color text #4c4f69; /* text */
@define-color base #eff1f5; /* base */
@define-color border #dce0e8; /* crust */

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 MiB