mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Compare commits
38 Commits
full-preem
...
revert-333
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d76589ba65 | ||
|
|
cac2b5728f | ||
|
|
279259d547 | ||
|
|
9b849fc824 | ||
|
|
bea57919b6 | ||
|
|
03cbbd2f7f | ||
|
|
8840af8df9 | ||
|
|
a54ec3a9cb | ||
|
|
42f47195ea | ||
|
|
89b1029588 | ||
|
|
29aae9a93e | ||
|
|
a6d49196d0 | ||
|
|
b7989ac89b | ||
|
|
3c19e4e12c | ||
|
|
94f29f3cba | ||
|
|
2fcc4e9c47 | ||
|
|
d81f6de211 | ||
|
|
e97ae0d842 | ||
|
|
2290152fb9 | ||
|
|
f364ee1167 | ||
|
|
6e1f1cae1b | ||
|
|
e354df3143 | ||
|
|
c981dda55a | ||
|
|
b6ba588fa3 | ||
|
|
bf3a5b0a36 | ||
|
|
9e1a70488b | ||
|
|
a43d090596 | ||
|
|
fceb7106d9 | ||
|
|
d2aeb520fc | ||
|
|
61678986fc | ||
|
|
2425f4d3e0 | ||
|
|
c6918e637b | ||
|
|
6f334868d6 | ||
|
|
79207160e6 | ||
|
|
a9d6a77ee6 | ||
|
|
a304b32cc1 | ||
|
|
3a744e0f78 | ||
|
|
88b13e6899 |
@@ -1,21 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Type=Application
|
|
||||||
TryExec=alacritty
|
|
||||||
Exec=alacritty
|
|
||||||
Icon=Alacritty
|
|
||||||
Terminal=false
|
|
||||||
Categories=System;TerminalEmulator;
|
|
||||||
Name=Alacritty
|
|
||||||
GenericName=Terminal
|
|
||||||
Comment=A fast, cross-platform, OpenGL terminal emulator
|
|
||||||
StartupNotify=true
|
|
||||||
StartupWMClass=Alacritty
|
|
||||||
Actions=New;
|
|
||||||
X-TerminalArgExec=-e
|
|
||||||
X-TerminalArgAppId=--class=
|
|
||||||
X-TerminalArgTitle=--title=
|
|
||||||
X-TerminalArgDir=--working-directory=
|
|
||||||
|
|
||||||
[Desktop Action New]
|
|
||||||
Name=New Terminal
|
|
||||||
Exec=alacritty
|
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
screensaver_in_focus() {
|
screensaver_in_focus() {
|
||||||
hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
|
hyprctl activewindow -j | jq -e '.class == "com.omarchy.Screensaver"' >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
exit_screensaver() {
|
exit_screensaver() {
|
||||||
hyprctl keyword cursor:invisible false
|
hyprctl keyword cursor:invisible false
|
||||||
pkill -x tte 2>/dev/null
|
pkill -x tte 2>/dev/null
|
||||||
pkill -f "alacritty --class Screensaver" 2>/dev/null
|
pkill -f com.omarchy.Screensaver 2>/dev/null
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
|
|||||||
pkill -SIGUSR2 ghostty
|
pkill -SIGUSR2 ghostty
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
|
||||||
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
|
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
|
||||||
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
|
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
|
||||||
xmlstarlet ed -L \
|
xmlstarlet ed -L \
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ ruby)
|
|||||||
omarchy-pkg-add libyaml
|
omarchy-pkg-add libyaml
|
||||||
mise use --global ruby@latest
|
mise use --global ruby@latest
|
||||||
mise settings add idiomatic_version_file_enable_tools ruby
|
mise settings add idiomatic_version_file_enable_tools ruby
|
||||||
|
echo "gem: --no-document" > ~/.gemrc
|
||||||
mise x ruby -- gem install rails --no-document
|
mise x ruby -- gem install rails --no-document
|
||||||
echo -e "\nYou can now run: rails new myproject"
|
echo -e "\nYou can now run: rails new myproject"
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -9,31 +9,43 @@ package="$1"
|
|||||||
|
|
||||||
# Map package name to desktop entry ID
|
# Map package name to desktop entry ID
|
||||||
case "$package" in
|
case "$package" in
|
||||||
alacritty)
|
alacritty) desktop_id="Alacritty.desktop" ;;
|
||||||
desktop_id="Alacritty.desktop"
|
ghostty) desktop_id="com.mitchellh.ghostty.desktop" ;;
|
||||||
;;
|
kitty) desktop_id="kitty.desktop" ;;
|
||||||
ghostty)
|
*)
|
||||||
desktop_id="com.mitchellh.ghostty.desktop"
|
echo "Unknown terminal: $package"
|
||||||
;;
|
exit 1
|
||||||
kitty)
|
;;
|
||||||
desktop_id="kitty.desktop"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unknown terminal: $package"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Install package
|
# Install package
|
||||||
if omarchy-pkg-add $package; then
|
if omarchy-pkg-add $package; then
|
||||||
# Set as default terminal
|
|
||||||
echo "Setting $package as new default terminal..."
|
|
||||||
sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
|
|
||||||
|
|
||||||
# Copy custom desktop entry for alacritty with X-TerminalArg* keys
|
# Copy custom desktop entry for alacritty with X-TerminalArg* keys
|
||||||
if [ "$package" = "alacritty" ]; then
|
if [[ $package == "alacritty" ]]; then
|
||||||
mkdir -p ~/.local/share/applications
|
mkdir -p ~/.local/share/applications
|
||||||
cp "$OMARCHY_PATH/applications/Alacritty.desktop" ~/.local/share/applications/
|
cat > ~/.local/share/applications/Alacritty.desktop << EOF
|
||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
TryExec=alacritty
|
||||||
|
Exec=alacritty
|
||||||
|
Icon=Alacritty
|
||||||
|
Terminal=false
|
||||||
|
Categories=System;TerminalEmulator;
|
||||||
|
Name=Alacritty
|
||||||
|
GenericName=Terminal
|
||||||
|
Comment=A fast, cross-platform, OpenGL terminal emulator
|
||||||
|
StartupNotify=true
|
||||||
|
StartupWMClass=Alacritty
|
||||||
|
Actions=New;
|
||||||
|
X-TerminalArgExec=-e
|
||||||
|
X-TerminalArgAppId=--class=
|
||||||
|
X-TerminalArgTitle=--title=
|
||||||
|
X-TerminalArgDir=--working-directory=
|
||||||
|
|
||||||
|
[Desktop Action New]
|
||||||
|
Name=New Terminal
|
||||||
|
Exec=alacritty
|
||||||
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Update xdg-terminals.list to prioritize the proper terminal
|
# Update xdg-terminals.list to prioritize the proper terminal
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ fi
|
|||||||
|
|
||||||
WINDOW_PATTERN="$1"
|
WINDOW_PATTERN="$1"
|
||||||
LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
|
LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
|
||||||
WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
|
WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "^$WINDOW_PATTERN$" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
|
||||||
|
|
||||||
if [[ -n $WINDOW_ADDRESS ]]; then
|
if [[ -n $WINDOW_ADDRESS ]]; then
|
||||||
hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
|
hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ if ! command -v tte &>/dev/null; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Exit early if screensave is already running
|
# Exit early if screensave is already running
|
||||||
pgrep -f "alacritty --class Screensaver" && exit 0
|
pgrep -f com.omarchy.Screensaver && exit 0
|
||||||
|
|
||||||
# Allow screensaver to be turned off but also force started
|
# Allow screensaver to be turned off but also force started
|
||||||
if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
|
if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
|
||||||
@@ -14,15 +14,34 @@ if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
|
focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
|
||||||
|
terminal=$(xdg-terminal-exec --print-id)
|
||||||
|
|
||||||
for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
|
for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
|
||||||
hyprctl dispatch focusmonitor $m
|
hyprctl dispatch focusmonitor $m
|
||||||
|
|
||||||
# FIXME: Find a way to make this generic where we it can work for kitty + ghostty
|
case $terminal in
|
||||||
hyprctl dispatch exec -- \
|
*Alacritty*)
|
||||||
alacritty --class Screensaver \
|
hyprctl dispatch exec -- \
|
||||||
--config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
|
alacritty --class=com.omarchy.Screensaver \
|
||||||
-e omarchy-cmd-screensaver
|
--config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
|
||||||
|
-e omarchy-cmd-screensaver
|
||||||
|
;;
|
||||||
|
*ghostty*)
|
||||||
|
hyprctl dispatch exec -- \
|
||||||
|
ghostty --class=com.omarchy.Screensaver \
|
||||||
|
--font-size=18 \
|
||||||
|
-e omarchy-cmd-screensaver
|
||||||
|
;;
|
||||||
|
*kitty*)
|
||||||
|
hyprctl dispatch exec -- \
|
||||||
|
kitty --class=com.omarchy.Screensaver \
|
||||||
|
--override font_size=18 \
|
||||||
|
-e omarchy-cmd-screensaver
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
notify-send "✋ Screensaver only runs in Alacritty, Ghostty, or Kitty"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
hyprctl dispatch focusmonitor $focused
|
hyprctl dispatch focusmonitor $focused
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Impala -e impala "$@"
|
exec setsid omarchy-launch-or-focus com.omarchy.Impala "uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Impala -e impala"
|
||||||
|
|||||||
@@ -9,4 +9,4 @@ if pgrep -x "1password" >/dev/null; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Avoid running screensaver when locked
|
# Avoid running screensaver when locked
|
||||||
pkill -f "alacritty --class Screensaver"
|
pkill -f com.omarchy.Screensaver
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ menu() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 600 -p "$prompt…" "${args[@]}" 2>/dev/null
|
echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 630 -p "$prompt…" "${args[@]}" 2>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
terminal() {
|
terminal() {
|
||||||
@@ -124,7 +124,7 @@ show_screenrecord_menu() {
|
|||||||
|
|
||||||
show_share_menu() {
|
show_share_menu() {
|
||||||
case $(menu "Share" " Clipboard\n File \n Folder") in
|
case $(menu "Share" " Clipboard\n File \n Folder") in
|
||||||
*Clipboard*) terminal bash -c "omarchy-cmd-share clipboard" ;;
|
*Clipboard*) omarchy-cmd-share clipboard ;;
|
||||||
*File*) terminal bash -c "omarchy-cmd-share file" ;;
|
*File*) terminal bash -c "omarchy-cmd-share file" ;;
|
||||||
*Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
|
*Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
|
||||||
*) back_to show_trigger_menu ;;
|
*) back_to show_trigger_menu ;;
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
|
if [[ $1 == "edge" ]]; then
|
||||||
|
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
|
||||||
|
else
|
||||||
|
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
|
||||||
|
fi
|
||||||
|
|||||||
@@ -51,6 +51,16 @@ EOF
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
add_hyprlock_fingerprint_icon() {
|
||||||
|
print_info "Adding fingerprint icon to hyprlock placeholder text..."
|
||||||
|
sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password <\/span>/' ~/.config/hypr/hyprlock.conf
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_hyprlock_fingerprint_icon() {
|
||||||
|
print_info "Removing fingerprint icon from hyprlock placeholder text..."
|
||||||
|
sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
|
||||||
|
}
|
||||||
|
|
||||||
remove_pam_config() {
|
remove_pam_config() {
|
||||||
# Remove from sudo
|
# Remove from sudo
|
||||||
if grep -q pam_fprintd.so /etc/pam.d/sudo; then
|
if grep -q pam_fprintd.so /etc/pam.d/sudo; then
|
||||||
@@ -71,6 +81,9 @@ if [[ "--remove" == "$1" ]]; then
|
|||||||
# Remove PAM configuration
|
# Remove PAM configuration
|
||||||
remove_pam_config
|
remove_pam_config
|
||||||
|
|
||||||
|
# Remove fingerprint icon from hyprlock placeholder text
|
||||||
|
remove_hyprlock_fingerprint_icon
|
||||||
|
|
||||||
# Uninstall packages
|
# Uninstall packages
|
||||||
print_info "Removing fingerprint packages..."
|
print_info "Removing fingerprint packages..."
|
||||||
sudo pacman -Rns --noconfirm fprintd
|
sudo pacman -Rns --noconfirm fprintd
|
||||||
@@ -90,6 +103,9 @@ else
|
|||||||
# Configure PAM
|
# Configure PAM
|
||||||
setup_pam_config
|
setup_pam_config
|
||||||
|
|
||||||
|
# Add fingerprint icon to hyprlock placeholder text
|
||||||
|
add_hyprlock_fingerprint_icon
|
||||||
|
|
||||||
# Enroll first fingerprint
|
# Enroll first fingerprint
|
||||||
print_success "\nLet's setup your right index finger as the first fingerprint."
|
print_success "\nLet's setup your right index finger as the first fingerprint."
|
||||||
print_info "Keep moving the finger around on sensor until the process completes.\n"
|
print_info "Keep moving the finger around on sensor until the process completes.\n"
|
||||||
|
|||||||
@@ -391,7 +391,7 @@ extract_theme_data() {
|
|||||||
readarray -t color_slots < <(fill_color_slots "${unique_colors[@]}" | tr ' ' '\n')
|
readarray -t color_slots < <(fill_color_slots "${unique_colors[@]}" | tr ' ' '\n')
|
||||||
|
|
||||||
# Extract fonts
|
# Extract fonts
|
||||||
local monospace_font="CaskaydiaMono Nerd Font"
|
local monospace_font="JetBrainsMono Nerd Font"
|
||||||
local ui_font="Liberation Sans"
|
local ui_font="Liberation Sans"
|
||||||
|
|
||||||
if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
|
if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ general.import = [ "~/.config/omarchy/current/theme/alacritty.toml" ]
|
|||||||
TERM = "xterm-256color"
|
TERM = "xterm-256color"
|
||||||
|
|
||||||
[font]
|
[font]
|
||||||
normal = { family = "CaskaydiaMono Nerd Font", style = "Regular" }
|
normal = { family = "JetBrainsMono Nerd Font", style = "Regular" }
|
||||||
bold = { family = "CaskaydiaMono Nerd Font", style = "Bold" }
|
bold = { family = "JetBrainsMono Nerd Font", style = "Bold" }
|
||||||
italic = { family = "CaskaydiaMono Nerd Font", style = "Italic" }
|
italic = { family = "JetBrainsMono Nerd Font", style = "Italic" }
|
||||||
size = 9
|
size = 9
|
||||||
|
|
||||||
[window]
|
[window]
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
<string>monospace</string>
|
<string>monospace</string>
|
||||||
</test>
|
</test>
|
||||||
<edit name="family" mode="assign" binding="strong">
|
<edit name="family" mode="assign" binding="strong">
|
||||||
<string>CaskaydiaMono Nerd Font</string>
|
<string>JetBrainsMono Nerd Font</string>
|
||||||
</edit>
|
</edit>
|
||||||
</match>
|
</match>
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
|
config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
|
||||||
|
|
||||||
# Font
|
# Font
|
||||||
font-family = "CaskaydiaMono Nerd Font"
|
font-family = "JetBrainsMono Nerd Font"
|
||||||
font-style = Regular
|
font-style = Regular
|
||||||
font-size = 9
|
font-size = 9
|
||||||
|
|
||||||
@@ -25,3 +25,6 @@ shell-integration-features = no-cursor,ssh-env
|
|||||||
# Keyboard bindings
|
# Keyboard bindings
|
||||||
keybind = shift+insert=paste_from_clipboard
|
keybind = shift+insert=paste_from_clipboard
|
||||||
keybind = control+insert=copy_to_clipboard
|
keybind = control+insert=copy_to_clipboard
|
||||||
|
|
||||||
|
# Slowdown mouse scrolling
|
||||||
|
mouse-scroll-multiplier = 0.95
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
|
|||||||
bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop
|
bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop
|
||||||
bindd = SUPER SHIFT, D, Docker, exec, $terminal -e lazydocker
|
bindd = SUPER SHIFT, D, Docker, exec, $terminal -e lazydocker
|
||||||
bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"
|
bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"
|
||||||
bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus "^obsidian$" "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
|
bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
|
||||||
bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
|
bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
|
||||||
bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
|
bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
|
||||||
|
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ input-field {
|
|||||||
outer_color = $outer_color
|
outer_color = $outer_color
|
||||||
outline_thickness = 4
|
outline_thickness = 4
|
||||||
|
|
||||||
font_family = CaskaydiaMono Nerd Font Propo
|
font_family = JetBrainsMono Nerd Font
|
||||||
font_color = $font_color
|
font_color = $font_color
|
||||||
|
|
||||||
placeholder_text = Enter Password
|
placeholder_text = Enter Password
|
||||||
check_color = $check_color
|
check_color = $check_color
|
||||||
fail_text = <i>$FAIL ($ATTEMPTS)</i>
|
fail_text = <i>$FAIL ($ATTEMPTS)</i>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
input {
|
input {
|
||||||
# Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
|
# Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
|
||||||
# kb_layout = us,dk,eu
|
# kb_layout = us,dk,eu
|
||||||
kb_options = compose:caps # ,grp:shifts_toggle
|
kb_options = compose:caps # ,grp:alts_toggle
|
||||||
|
|
||||||
# Change speed of keyboard repeat
|
# Change speed of keyboard repeat
|
||||||
repeat_rate = 40
|
repeat_rate = 40
|
||||||
|
|||||||
@@ -1,2 +1,13 @@
|
|||||||
[binds]
|
[binds]
|
||||||
<Ctrl+p> = exec lp $imv_current_file
|
|
||||||
|
# Print the current image file
|
||||||
|
<Ctrl+p> = exec lp "$imv_current_file"
|
||||||
|
|
||||||
|
# Delete the current image and quit the viewer
|
||||||
|
<Ctrl+x> = exec rm "$imv_current_file"; quit
|
||||||
|
|
||||||
|
# Delete the current image and move to the next one
|
||||||
|
<Ctrl+Shift+X> = exec rm "$imv_current_file"; close
|
||||||
|
|
||||||
|
# Rotate the currently open image by 90 degrees
|
||||||
|
<Ctrl+r> = exec mogrify -rotate 90 "$imv_current_file"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
include ~/.config/omarchy/current/theme/kitty.conf
|
include ~/.config/omarchy/current/theme/kitty.conf
|
||||||
|
|
||||||
# Font
|
# Font
|
||||||
font_family CaskaydiaMono Nerd Font
|
font_family JetBrainsMono Nerd Font
|
||||||
bold_italic_font auto
|
bold_italic_font auto
|
||||||
font_size 9.0
|
font_size 9.0
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ window {
|
|||||||
}
|
}
|
||||||
|
|
||||||
label {
|
label {
|
||||||
font-family: 'CaskaydiaMono Nerd Font';
|
font-family: 'JetBrainsMono Nerd Font';
|
||||||
font-size: 11pt;
|
font-size: 11pt;
|
||||||
|
|
||||||
color: @label;
|
color: @label;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
font-family: 'CaskaydiaMono Nerd Font';
|
font-family: 'JetBrainsMono Nerd Font';
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
3
config/xdg-terminals.list
Normal file
3
config/xdg-terminals.list
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
# Terminal emulator preference order for xdg-terminal-exec
|
||||||
|
# The first found and valid terminal will be used
|
||||||
|
com.mitchellh.ghostty.desktop
|
||||||
@@ -25,14 +25,21 @@ format-drive() {
|
|||||||
else
|
else
|
||||||
echo "WARNING: This will completely erase all data on $1 and label it '$2'."
|
echo "WARNING: This will completely erase all data on $1 and label it '$2'."
|
||||||
read -rp "Are you sure you want to continue? (y/N): " confirm
|
read -rp "Are you sure you want to continue? (y/N): " confirm
|
||||||
|
|
||||||
if [[ "$confirm" =~ ^[Yy]$ ]]; then
|
if [[ "$confirm" =~ ^[Yy]$ ]]; then
|
||||||
sudo wipefs -a "$1"
|
sudo wipefs -a "$1"
|
||||||
sudo dd if=/dev/zero of="$1" bs=1M count=100 status=progress
|
sudo dd if=/dev/zero of="$1" bs=1M count=100 status=progress
|
||||||
sudo parted -s "$1" mklabel gpt
|
sudo parted -s "$1" mklabel gpt
|
||||||
sudo parted -s "$1" mkpart primary ext4 1MiB 100%
|
sudo parted -s "$1" mkpart primary 1MiB 100%
|
||||||
sudo mkfs.ext4 -L "$2" "$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
|
|
||||||
sudo chmod -R 777 "/run/media/$USER/$2"
|
partition="$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
|
||||||
echo "Drive $1 formatted and labeled '$2'."
|
sudo partprobe "$1" || true
|
||||||
|
sudo udevadm settle || true
|
||||||
|
|
||||||
|
omarchy-pkg-add exfatprogs
|
||||||
|
sudo mkfs.exfat -n "$2" "$partition"
|
||||||
|
|
||||||
|
echo "Drive $1 formatted as exFAT and labeled '$2'."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ if command -v zoxide &> /dev/null; then
|
|||||||
eval "$(zoxide init bash)"
|
eval "$(zoxide init bash)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if command -v try &> /dev/null; then
|
||||||
|
eval "$(try init ~/Work/tries)"
|
||||||
|
fi
|
||||||
|
|
||||||
if command -v fzf &> /dev/null; then
|
if command -v fzf &> /dev/null; then
|
||||||
if [[ -f /usr/share/fzf/completion.bash ]]; then
|
if [[ -f /usr/share/fzf/completion.bash ]]; then
|
||||||
source /usr/share/fzf/completion.bash
|
source /usr/share/fzf/completion.bash
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
windowrule = noscreenshare, class:^(1Password)$
|
windowrule = noscreenshare, class:^(1[p|P]assword)$
|
||||||
|
windowrule = tag +floating-window, class:^(1[p|P]assword)$
|
||||||
|
|||||||
@@ -1,9 +1,19 @@
|
|||||||
# JetBrains windows default size
|
# Fix splash screen showing in weird places and prevent annoying focus takeovers
|
||||||
windowrule = size 50% 50%, class:(.*jetbrains.*)$, title:^$
|
windowrule = tag +jetbrains-splash, class:^(jetbrains-.*)$, title:^(splash)$, floating:1
|
||||||
|
windowrule = center, tag:jetbrains-splash
|
||||||
|
windowrule = nofocus, tag:jetbrains-splash
|
||||||
|
windowrule = noborder, tag:jetbrains-splash
|
||||||
|
|
||||||
# Fix tab dragging (tab titles are just one space)
|
# Center popups/find windows
|
||||||
windowrule = noinitialfocus, class:^(.*jetbrains.*)$, title:^\\s$
|
windowrule = tag +jetbrains, class:^(jetbrains-.*), title:^()$, floating:1
|
||||||
|
windowrule = center, tag:jetbrains
|
||||||
|
|
||||||
# Allow dialogs (like "Send usage statistics") to be focusable and clickable
|
# Enabling this makes it possible to provide input in popup dialogs (search window, new file, etc.)
|
||||||
windowrule = unset,nofocus,class:^(.*jetbrains.*)$,title:^$
|
windowrule = stayfocused, tag:jetbrains
|
||||||
windowrule = unset,noinitialfocus,class:^(.*jetbrains.*)$,title:^$
|
windowrule = noborder, tag:jetbrains
|
||||||
|
|
||||||
|
# For some reason tag:jetbrains does not work for size rule
|
||||||
|
windowrule = size >50% >50%, class:^(jetbrains-.*), title:^()$, floating:1
|
||||||
|
|
||||||
|
# Disable window flicker when autocomplete or tooltips appear
|
||||||
|
windowrule = noinitialfocus, class:^(jetbrains-.*)$, title:^(win.*)$, floating:1
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|De
|
|||||||
windowrule = float, class:org.gnome.Calculator
|
windowrule = float, class:org.gnome.Calculator
|
||||||
|
|
||||||
# Fullscreen screensaver
|
# Fullscreen screensaver
|
||||||
windowrule = fullscreen, class:Screensaver
|
windowrule = fullscreen, class:com.omarchy.Screensaver
|
||||||
|
|
||||||
# No transparency on media windows
|
# No transparency on media windows
|
||||||
windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
|
windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
|
||||||
|
|||||||
@@ -38,8 +38,11 @@ decoration {
|
|||||||
# https://wiki.hyprland.org/Configuring/Variables/#blur
|
# https://wiki.hyprland.org/Configuring/Variables/#blur
|
||||||
blur {
|
blur {
|
||||||
enabled = true
|
enabled = true
|
||||||
size = 3
|
size = 2
|
||||||
passes = 3
|
passes = 2
|
||||||
|
special = true
|
||||||
|
brightness = 0.60
|
||||||
|
contrast = 0.75
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
Server = https://mirror.omarchy.org/$repo/os/$arch
|
|
||||||
Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
|
|
||||||
Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
|
|
||||||
1
default/pacman/mirrorlist-edge
Normal file
1
default/pacman/mirrorlist-edge
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Server = https://mirror.omarchy.org/$repo/os/$arch
|
||||||
1
default/pacman/mirrorlist-stable
Normal file
1
default/pacman/mirrorlist-stable
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Server = https://stable-mirror.omarchy.org/$repo/os/$arch
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
# Add ./bin to path for all items in ~/Work
|
# Setup default work directory (and tries)
|
||||||
mkdir -p "$HOME/Work"
|
mkdir -p "$HOME/Work"
|
||||||
|
mkdir -p "$HOME/Work/tries"
|
||||||
|
|
||||||
|
# Add ./bin to path for all items in ~/Work
|
||||||
cat >"$HOME/Work/.mise.toml" <<'EOF'
|
cat >"$HOME/Work/.mise.toml" <<'EOF'
|
||||||
[env]
|
[env]
|
||||||
_.path = "{{ cwd }}/bin"
|
_.path = "{{ cwd }}/bin"
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
1password-beta
|
1password-beta
|
||||||
1password-cli
|
1password-cli
|
||||||
aether
|
aether
|
||||||
alacritty
|
|
||||||
asdcontrol
|
asdcontrol
|
||||||
avahi
|
avahi
|
||||||
bash-completion
|
bash-completion
|
||||||
@@ -12,7 +11,6 @@ bat
|
|||||||
blueberry
|
blueberry
|
||||||
brightnessctl
|
brightnessctl
|
||||||
btop
|
btop
|
||||||
cargo
|
|
||||||
clang
|
clang
|
||||||
cups
|
cups
|
||||||
cups-browsed
|
cups-browsed
|
||||||
@@ -33,6 +31,7 @@ fd
|
|||||||
ffmpegthumbnailer
|
ffmpegthumbnailer
|
||||||
fontconfig
|
fontconfig
|
||||||
fzf
|
fzf
|
||||||
|
ghostty
|
||||||
github-cli
|
github-cli
|
||||||
gnome-calculator
|
gnome-calculator
|
||||||
gnome-keyring
|
gnome-keyring
|
||||||
@@ -64,12 +63,12 @@ less
|
|||||||
libsecret
|
libsecret
|
||||||
libyaml
|
libyaml
|
||||||
libqalculate
|
libqalculate
|
||||||
libreoffice
|
libreoffice-fresh
|
||||||
llvm
|
llvm
|
||||||
localsend
|
localsend
|
||||||
luarocks
|
luarocks
|
||||||
mako
|
mako
|
||||||
man
|
man-db
|
||||||
mariadb-libs
|
mariadb-libs
|
||||||
mise
|
mise
|
||||||
mpv
|
mpv
|
||||||
@@ -99,6 +98,8 @@ python-poetry-core
|
|||||||
python-terminaltexteffects
|
python-terminaltexteffects
|
||||||
qt5-wayland
|
qt5-wayland
|
||||||
ripgrep
|
ripgrep
|
||||||
|
ruby
|
||||||
|
rust
|
||||||
satty
|
satty
|
||||||
sddm
|
sddm
|
||||||
signal-desktop
|
signal-desktop
|
||||||
@@ -111,6 +112,7 @@ swayosd
|
|||||||
system-config-printer
|
system-config-printer
|
||||||
tldr
|
tldr
|
||||||
tree-sitter-cli
|
tree-sitter-cli
|
||||||
|
tobi-try
|
||||||
ttf-cascadia-mono-nerd
|
ttf-cascadia-mono-nerd
|
||||||
ttf-ia-writer
|
ttf-ia-writer
|
||||||
ttf-jetbrains-mono-nerd
|
ttf-jetbrains-mono-nerd
|
||||||
@@ -119,6 +121,7 @@ tzupdate
|
|||||||
ufw
|
ufw
|
||||||
ufw-docker
|
ufw-docker
|
||||||
unzip
|
unzip
|
||||||
|
usage
|
||||||
uwsm
|
uwsm
|
||||||
waybar
|
waybar
|
||||||
wayfreeze
|
wayfreeze
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ pipewire
|
|||||||
pipewire-alsa
|
pipewire-alsa
|
||||||
pipewire-jack
|
pipewire-jack
|
||||||
pipewire-pulse
|
pipewire-pulse
|
||||||
qt5-remoteobjects
|
|
||||||
qt6-wayland
|
qt6-wayland
|
||||||
sassc
|
sassc
|
||||||
snapper
|
snapper
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Configure pacman
|
# Configure pacman
|
||||||
sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
|
sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
|
||||||
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
|
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
if lspci -nn | grep -q "106b:180[12]"; then
|
if lspci -nn | grep -q "106b:180[12]"; then
|
||||||
cat <<EOF | sudo tee -a /etc/pacman.conf >/dev/null
|
cat <<EOF | sudo tee -a /etc/pacman.conf >/dev/null
|
||||||
|
|||||||
@@ -12,15 +12,9 @@ omarchy-pkg-add xdg-terminal-exec
|
|||||||
# Set up xdg-terminals.list based on current $TERMINAL
|
# Set up xdg-terminals.list based on current $TERMINAL
|
||||||
if [ -n "$TERMINAL" ]; then
|
if [ -n "$TERMINAL" ]; then
|
||||||
case "$TERMINAL" in
|
case "$TERMINAL" in
|
||||||
alacritty)
|
alacritty) desktop_id="Alacritty.desktop" ;;
|
||||||
desktop_id="Alacritty.desktop"
|
ghostty) desktop_id="com.mitchellh.ghostty.desktop" ;;
|
||||||
;;
|
kitty) desktop_id="kitty.desktop" ;;
|
||||||
ghostty)
|
|
||||||
desktop_id="com.mitchellh.ghostty.desktop"
|
|
||||||
;;
|
|
||||||
kitty)
|
|
||||||
desktop_id="kitty.desktop"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ -n "$desktop_id" ]; then
|
if [ -n "$desktop_id" ]; then
|
||||||
|
|||||||
12
migrations/1762684663.sh
Normal file
12
migrations/1762684663.sh
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
echo "Update hyprlock font to match current system font"
|
||||||
|
|
||||||
|
font_name=$(omarchy-font-current)
|
||||||
|
|
||||||
|
if [[ -n "$font_name" ]]; then
|
||||||
|
cp ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak.$(date +%s)
|
||||||
|
|
||||||
|
echo "Found font '$font_name', updating hyprlock"
|
||||||
|
sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
|
||||||
|
else
|
||||||
|
echo "No font found, skipping migration"
|
||||||
|
fi
|
||||||
12
migrations/1762685081.sh
Normal file
12
migrations/1762685081.sh
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
echo "Update hyprlock placeholder text based on fingerprint setup status"
|
||||||
|
|
||||||
|
cp ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak.$(date +%s)
|
||||||
|
|
||||||
|
# Check if fprintd is installed and has enrolled fingerprints
|
||||||
|
if command -v fprintd-list &>/dev/null && fprintd-list "$USER" 2>/dev/null | grep -q "Fingerprints for user"; then
|
||||||
|
echo "Fingerprint detected, updating placeholder text with fingerprint icon"
|
||||||
|
sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password <\/span>/' ~/.config/hypr/hyprlock.conf
|
||||||
|
else
|
||||||
|
echo "No fingerprint enrolled, updating placeholder text without fingerprint icon"
|
||||||
|
sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
|
||||||
|
fi
|
||||||
3
migrations/1762711005.sh
Normal file
3
migrations/1762711005.sh
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
echo "Add usage package to provide tab completion for mise"
|
||||||
|
|
||||||
|
omarchy-pkg-add usage
|
||||||
3
migrations/1762768186.sh
Normal file
3
migrations/1762768186.sh
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
echo "Ensure config/uwsm/default uses generic terminal exec"
|
||||||
|
|
||||||
|
sed -i 's/export TERMINAL=.*/export TERMINAL=xdg-terminal-exec/' ~/.config/uwsm/default
|
||||||
5
migrations/1762770442.sh
Normal file
5
migrations/1762770442.sh
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
echo "Slow down Ghostty mouse scrolling to match Alacritty"
|
||||||
|
|
||||||
|
if ! grep -q "mouse-scroll-multiplier" ~/.config/ghostty/config; then
|
||||||
|
echo -e "\n# Slowdown mouse scrolling\nmouse-scroll-multiplier = 0.95" >> ~/.config/ghostty/config
|
||||||
|
fi
|
||||||
3
migrations/1762770815.sh
Normal file
3
migrations/1762770815.sh
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
echo "Pull packages from stable Arch mirror"
|
||||||
|
|
||||||
|
omarchy-refresh-pacman-mirrorlist stable
|
||||||
4
migrations/1762781907.sh
Normal file
4
migrations/1762781907.sh
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
echo "Add try command for managing quick code experiments"
|
||||||
|
|
||||||
|
omarchy-pkg-add ruby tobi-try
|
||||||
|
mkdir -p ~/Work/tries
|
||||||
4
migrations/1762802472.sh
Normal file
4
migrations/1762802472.sh
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
echo "Update imv config with new keybindings"
|
||||||
|
|
||||||
|
mkdir -p ~/.config/imv
|
||||||
|
cp $OMARCHY_PATH/config/imv/config ~/.config/imv/
|
||||||
Reference in New Issue
Block a user