Fix emoji picker description (#1091)

UX: Change webapp removal selection icons

bin/comarchy-toggle-disable-internal-monitor

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -u
-
-# internal monitor name - change if yours differs
-INT="eDP-1"
-
-output=$(hyprctl monitors 2>/dev/null) || {
-    echo "Error: hyprctl not found or command failed" >&2
-    exit 1
-}
-
-mapfile -t monitors < <(
-    grep -oP '(?<=^Monitor ).*?(?= \(ID )' <<<"$output"
-)
-
-len=${#monitors[@]}
-
-if (( len == 2 )); then
-    hyprctl keyword monitor $INT, disable 2>/dev/null
-    hyprctl keyword workspace r[0-9] m[${monitors[1]}]
-elif (( len == 3 )); then
-    hyprctl keyword monitor $INT, disable 2>/dev/null
-    hyprctl keyword workspace r[1-5] m[${monitors[1]}]
-    hyprctl keyword workspace r[6-9] m[${monitors[2]}]
-    hyprctl keyword workspace r[0] m[${monitors[2]}]
-else
-    hyprctl keyword monitor $INT, preferred,auto,1.5 2>/dev/null
-    hyprctl reload 2>/dev/null
-fi

bin/omarchy-font-list

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting' | sort -u
+fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting|omarchy' | sort -u

bin/omarchy-launch-browser

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,/usr}/share/applications/$(xdg-settings get default-web-browser) 2>/dev/null | head -1) ${args[@]} $@
+exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$(xdg-settings get default-web-browser) 2>/dev/null | head -1) ${args[@]} $@

bin/omarchy-launch-webapp

@@ -7,4 +7,4 @@ google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;;
 *) browser="chromium.desktop" ;;
 esac
 
-exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}"
+exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}"

bin/omarchy-menu

@@ -315,7 +315,7 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" "󰣇  Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;

bin/omarchy-tui-remove

@@ -14,7 +14,7 @@ if [ "$#" -ne 1 ]; then
   if ((${#TUIS[@]})); then
     IFS=$'\n' SORTED_TUIS=($(sort <<<"${TUIS[*]}"))
     unset IFS
-    APP_NAME=$(gum choose --header "Select TUI to remove..." "${SORTED_TUIS[@]}")
+    APP_NAME=$(gum choose --no-limit --header "Select TUI to remove..." --selected-prefix="✗ " "${SORTED_TUIS[@]}")
   else
     echo "No TUIs to remove."
     exit 1

bin/omarchy-webapp-remove

@@ -14,7 +14,7 @@ if [ "$#" -eq 0 ]; then
   if ((${#WEB_APPS[@]})); then
     IFS=$'\n' SORTED_WEB_APPS=($(sort <<<"${WEB_APPS[*]}"))
     unset IFS
-    APP_NAMES=$(gum choose --no-limit --header "Select web app to remove..." "${SORTED_WEB_APPS[@]}")
+    APP_NAMES=$(gum choose --no-limit --header "Select web app to remove..." --selected-prefix="✗ " "${SORTED_WEB_APPS[@]}")
   else
     echo "No web apps to remove."
     exit 1

boot.sh

@@ -19,10 +19,9 @@ sudo pacman -Sy --noconfirm --needed git
 # Use custom repo if specified, otherwise default to basecamp/omarchy
 OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
 
-echo -e "\nCloning Omarchy from: https://git.itsscb.de/itsscb/omarchy.git"
+echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
 rm -rf ~/.local/share/omarchy/
-# git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
-git clone "https://git.itsscb.de/itsscb/omarchy.git" ~/.local/share/omarchy >/dev/null
+git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
 
 # Use custom branch if instructed, otherwise default to master
 OMARCHY_REF="${OMARCHY_REF:-master}"

config/hypr/autostart.conf

@@ -1,6 +1,2 @@
 # Extra autostart processes
 # exec-once = uwsm app -- my-service
-exec-once = [workspace 2 silent] zen-browser
-exec-once = [workspace 3 silent] thunderbird
-exec-once = [workspace 4 silent] deltachat-desktop
-exec-once = [workspace 5 silent] ghostty

config/hypr/bindings.conf

@@ -1,17 +1,28 @@
 # Application bindings
-$terminal = ghostty
+$terminal = uwsm app -- alacritty
 $browser = omarchy-launch-browser
 
-bindd = SUPER, T, Terminal, exec, $terminal #--working-directory $(omarchy-cmd-terminal-cwd)
+bindd = SUPER, return, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd)
 bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
 bindd = SUPER, B, Browser, exec, $browser
 bindd = SUPER, M, Music, exec, uwsm app -- spotify
 bindd = SUPER, N, Neovim, exec, $terminal -e nvim
+bindd = SUPER, T, Activity, exec, $terminal -e btop
 bindd = SUPER, D, Docker, exec, $terminal -e lazydocker
+bindd = SUPER, G, Signal, exec, uwsm app -- signal-desktop
+bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu
+bindd = SUPER, slash, Passwords, exec, uwsm app -- 1password
 
 # If your web app url contains #, type it as ## to prevent hyperland treat it as comments
-bindd = SUPER, A, Kagi Assistant, exec, omarchy-launch-webapp "https://kagi.com/assistant"
+bindd = SUPER, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
+bindd = SUPER SHIFT, A, Grok, exec, omarchy-launch-webapp "https://grok.com"
+bindd = SUPER, C, Calendar, exec, omarchy-launch-webapp "https://app.hey.com/calendar/weeks/"
+bindd = SUPER, E, Email, exec, omarchy-launch-webapp "https://app.hey.com"
 bindd = SUPER, Y, YouTube, exec, omarchy-launch-webapp "https://youtube.com/"
+bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-webapp "https://web.whatsapp.com/"
+bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-webapp "https://messages.google.com/web/conversations"
+bindd = SUPER, X, X, exec, omarchy-launch-webapp "https://x.com/"
+bindd = SUPER SHIFT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post"
 
 # Overwrite existing bindings, like putting Omarchy Menu on Super + Space
 # unbind = SUPER, Space

config/hypr/hyprland.conf

@@ -17,8 +17,3 @@ source = ~/.config/hypr/input.conf
 source = ~/.config/hypr/bindings.conf
 source = ~/.config/hypr/envs.conf
 source = ~/.config/hypr/autostart.conf
-
-# NVIDIA environment variables
-env = NVD_BACKEND,direct
-env = LIBVA_DRIVER_NAME,nvidia
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia

config/hypr/hyprlock.conf

@@ -1,85 +1,37 @@
+source = ~/.config/omarchy/current/theme/hyprlock.conf
 
-$accent = rgb(94e2d5)
-$accentAlpha = 94e2d5
-$red = rgb(f38ba8)
-$redAlpha = f38ba8
-$yellow = rgb(f9e2af)
-$yellowAlpha = f9e2af
-$surface0 = rgb(313244)
-$surface0Alpha = 313244
-$text = rgb(ffffff)
-$base = rgb(000000)
-$font = CaskaydiaMono Nerd Font
-# GENERAL
-general {
-    disable_loading_bar = true
-    hide_cursor = true
-}
-
-# BACKGROUND
 background {
     monitor =
-    path = ~/.config/omarchy/current/background
-    blur_passes = 2
-    color = $base
+    color = $color
 }
 
-# TIME
-label {
-    monitor =
-    text = cmd[update:30000] echo "$(date +"%R")"
-    color = $text
-    font_size = 90
-    font_family = $font
-    position = -30, 0
-    halign = right
-    valign = top
+animations {
+    enabled = false
 }
 
-# DATE 
-label {
-    monitor = 
-    text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"
-    color = $text
-    font_size = 25
-    font_family = $font
-    position = -30, -150
-    halign = right
-    valign = top
-}
-
-# USER AVATAR
-
-image {
-    monitor = 
-    path = ~/.face
-    size = 100
-    border_color = $accent
-
-    position = 0, 75
-    halign = center
-    valign = center
-}
-
-# INPUT FIELD
 input-field {
     monitor =
-    size = 300, 60
-    outline_thickness = 4
-    dots_size = 0.2
-    dots_spacing = 0.2
-    dots_center = true
-    outer_color = $accent
-    inner_color = $surface0
-    font_color = $text
-    fade_on_empty = false
-    placeholder_text = 󰌾
-    hide_input = false
-    check_color = $accent
-    fail_color = $red
-    fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-    capslock_color = $yellow
-    position = 0, -35
+    size = 600, 100
+    position = 0, 0
     halign = center
     valign = center
+
+    inner_color = $inner_color
+    outer_color = $outer_color
+    outline_thickness = 4
+
+    font_family = CaskaydiaMono Nerd Font
+    font_color = $font_color
+
+    placeholder_text =   Enter Password 󰈷 
+    check_color = $check_color
+    fail_text = <i>$PAMFAIL ($ATTEMPTS)</i>
+
+    rounding = 0
+    shadow_passes = 0
+    fade_on_empty = false
+}
+
+auth {
+    fingerprint:enabled = true
 }

config/hypr/monitors.conf

@@ -5,7 +5,7 @@
 
 # Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
 env = GDK_SCALE,2
-monitor=,preferred,auto-right,auto
+monitor=,preferred,auto,auto
 
 # Good compromise for 27" or 32" 4K monitors (but fractional!)
 # env = GDK_SCALE,1.75

default/hypr/bindings.conf

@@ -5,7 +5,7 @@ bindd = SUPER, F, File manager, exec, $fileManager
 bindd = SUPER, B, Web browser, exec, $browser
 bindd = SUPER, M, Music player, exec, $music
 bindd = SUPER, N, Neovim, exec, $terminal -e nvim
-# bindd = SUPER, T, Top, exec, $terminal -e btop
+bindd = SUPER, T, Top, exec, $terminal -e btop
 bindd = SUPER, D, Lazy Docker, exec, $terminal -e lazydocker
 bindd = SUPER, G, Messenger, exec, $messenger
 bindd = SUPER, O, Obsidian, exec, obsidian -disable-gpu

default/hypr/bindings/tiling.conf

@@ -10,13 +10,9 @@ bindd = SHIFT, F11, Force full screen, fullscreen, 0
 
 # Move focus with SUPER + arrow keys
 bindd = SUPER, left, Move focus left, movefocus, l
-bindd = SUPER, h, Move focus left, movefocus, l
 bindd = SUPER, right, Move focus right, movefocus, r
-bindd = SUPER, l, Move focus right, movefocus, r
 bindd = SUPER, up, Move focus up, movefocus, u
-bindd = SUPER, k, Move focus up, movefocus, u
 bindd = SUPER, down, Move focus down, movefocus, d
-bindd = SUPER, j, Move focus down, movefocus, d
 
 # Switch workspaces with SUPER + [0-9]
 bindd = SUPER, code:10, Switch to workspace 1, workspace, 1
@@ -43,8 +39,8 @@ bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
 bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
 
 # Tab between workspaces
-bind = SUPER, TAB, workspace, e+1
-bind = SUPER SHIFT, TAB, workspace, e-1
+bindd = SUPER, TAB, Next workspace, workspace, e+1
+bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1
 
 # Swap active window with the one next to it with SUPER + SHIFT + arrow keys
 bindd = SUPER SHIFT, left, Swap window to the left, swapwindow, l

default/hypr/bindings/utilities.conf

@@ -1,6 +1,6 @@
 # Menus
-bindd = SUPER, R, Launch apps, exec, walker -p "Start…"
-bindd = SUPER CTRL, E, Show clipboard, exec, walker -m Emojis
+bindd = SUPER, SPACE, Launch apps, exec, walker -p "Start…"
+bindd = SUPER CTRL, E, Emoji picker, exec, walker -m Emojis
 bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
 bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system
 bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
@@ -38,6 +38,3 @@ bindd = CTRL ALT, PRINT, Screen record display, exec, omarchy-cmd-screenrecord o
 
 # Color picker
 bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
-
-# Disable internal monitor
-bindd = SUPER CTRL, F12, Disable Internal Monitor, exec, comarchy-toggle-disable-internal-monitor

install/config/git.sh

@@ -16,5 +16,3 @@ fi
 if [[ -n "${OMARCHY_USER_EMAIL//[[:space:]]/}" ]]; then
   git config --global user.email "$OMARCHY_USER_EMAIL"
 fi
-
-git config --global credential.helper /usr/lib/git-core/git-credential-libsecret

install/config/theme.sh

@@ -10,11 +10,11 @@ for f in ~/.local/share/omarchy/themes/*; do ln -nfs "$f" ~/.config/omarchy/them
 
 # Set initial theme
 mkdir -p ~/.config/omarchy/current
-ln -snf ~/.config/omarchy/themes/rose-pine/ ~/.config/omarchy/current/theme
-ln -snf ~/.config/omarchy/current/theme/backgrounds/cthulhu.jpg ~/.config/omarchy/current/background
+ln -snf ~/.config/omarchy/themes/tokyo-night ~/.config/omarchy/current/theme
+ln -snf ~/.config/omarchy/current/theme/backgrounds/1-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png ~/.config/omarchy/current/background
 
 # Set specific app links for current theme
-# ln -snf ~/.config/omarchy/current/theme/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
+ln -snf ~/.config/omarchy/current/theme/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
 
 mkdir -p ~/.config/btop/themes
 ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme

install/packages.sh

@@ -1,11 +1,7 @@
 sudo pacman -S --noconfirm --needed \
-  gimp \
-  inkscape \
-  jujutsu \
-  thunderbird \
-  deltachat-desktop \
-  keepassxc \
-  ghostty \
+  1password-beta \
+  1password-cli \
+  alacritty \
   avahi \
   bash-completion \
   bat \
@@ -13,7 +9,6 @@ sudo pacman -S --noconfirm --needed \
   brightnessctl \
   btop \
   cargo \
-  rustup \
   clang \
   cups \
   cups-browsed \
@@ -74,7 +69,8 @@ sudo pacman -S --noconfirm --needed \
   nss-mdns \
   nvim \
   obs-studio \
-  chromium \
+  obsidian \
+  omarchy-chromium \
   pamixer \
   pinta \
   playerctl \
@@ -88,6 +84,7 @@ sudo pacman -S --noconfirm --needed \
   python-terminaltexteffects \
   ripgrep \
   satty \
+  signal-desktop \
   slurp \
   spotify \
   starship \
@@ -101,6 +98,7 @@ sudo pacman -S --noconfirm --needed \
   ttf-font-awesome \
   ttf-ia-writer \
   ttf-jetbrains-mono \
+  typora \
   tzupdate \
   ufw \
   ufw-docker \

install/packaging/lazyvim.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
 if [[ ! -d "$HOME/.config/nvim" ]]; then
-  git clone https://git.itsscb.de/itsscb/kickstart.nvim ~/.config/nvim
+  git clone https://github.com/LazyVim/starter ~/.config/nvim
+  cp -R ~/.local/share/omarchy/config/nvim/* ~/.config/nvim/
   rm -rf ~/.config/nvim/.git
+  echo "vim.opt.relativenumber = false" >>~/.config/nvim/lua/config/options.lua
 fi

install/packaging/webapps.sh

@@ -1,16 +1,15 @@
 #!/bin/bash
 
-# omarchy-webapp-install "HEY" https://app.hey.com https://www.hey.com/assets/images/general/hey.png
-# omarchy-webapp-install "Basecamp" https://launchpad.37signals.com https://basecamp.com/assets/images/general/basecamp.png
-# omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png
-# omarchy-webapp-install "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png
-# omarchy-webapp-install "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png
-# omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png
-omarchy-webapp-install "Kagi Assistant" https://kagi.com/assistant https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png
+omarchy-webapp-install "HEY" https://app.hey.com https://www.hey.com/assets/images/general/hey.png
+omarchy-webapp-install "Basecamp" https://launchpad.37signals.com https://basecamp.com/assets/images/general/basecamp.png
+omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png
+omarchy-webapp-install "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png
+omarchy-webapp-install "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png
+omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png
+omarchy-webapp-install "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png
 omarchy-webapp-install "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png
-omarchy-webapp-install "Netflix" https://netflix.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/netflix.png
 omarchy-webapp-install "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png
-# omarchy-webapp-install "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.png
-# omarchy-webapp-install "Figma" https://figma.com/ https://www.veryicon.com/download/png/application/app-icon-7/figma-1?s=256
-# omarchy-webapp-install "Discord" https://discord.com/channels/@me https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/discord.png
-# omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/zoom.png
+omarchy-webapp-install "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.png
+omarchy-webapp-install "Figma" https://figma.com/ https://www.veryicon.com/download/png/application/app-icon-7/figma-1?s=256
+omarchy-webapp-install "Discord" https://discord.com/channels/@me https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/discord.png
+omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/zoom.png

themes/rose-pine/hyprlock.conf

@@ -1,5 +1,5 @@
 $color = rgba(250, 244, 237,1.0)
-$outer_color = rgba(250, 244, 237,0.8)
-$inner_color = rgba(57,52,79,1.0)
-$check_color = rgba(57,52,79,1.0)
-$font_color = rgba(136, 192, 208, 1.0)
+$inner_color = rgba(250, 244, 237,0.8)
+$outer_color = rgba(57,52,79,1.0)
+$font_color = rgba(57,52,79,1.0)
+$check_color = rgba(136, 192, 208, 1.0)

themes/rose-pine/walker.css

@@ -1,6 +1,6 @@
 @define-color selected-text #88C0D0;
-@define-color base #575279;
-@define-color text #faf4ed;
+@define-color text #575279;
+@define-color base #faf4ed;
 @define-color border #575279;
-@define-color background #575279;
-@define-color foreground #faf4ed;
+@define-color foreground #575279;
+@define-color background #faf4ed;

themes/rose-pine/waybar.css

@@ -1,2 +1,2 @@
-@define-color background #575279;
-@define-color foreground #faf4ed;
+@define-color foreground #575279;
+@define-color background #faf4ed;