diff --git a/applications/hidden/electron36.desktop b/applications/hidden/electron36.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/electron36.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/applications/hidden/electron37.desktop b/applications/hidden/electron37.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/electron37.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/applications/hidden/java-java-openjdk.desktop b/applications/hidden/java-java-openjdk.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/java-java-openjdk.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/applications/hidden/jconsole-java-openjdk.desktop b/applications/hidden/jconsole-java-openjdk.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/jconsole-java-openjdk.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/applications/hidden/jshell-java-openjdk.desktop b/applications/hidden/jshell-java-openjdk.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/jshell-java-openjdk.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/applications/nvim.desktop b/applications/nvim.desktop index ed118590..b064c32e 100644 --- a/applications/nvim.desktop +++ b/applications/nvim.desktop @@ -2,7 +2,7 @@ Name=Neovim GenericName=Text Editor Comment=Edit text files -Exec=$TERMINAL --class=nvim --title=nvim -e nvim -- %F +Exec=sh -c "$TERMINAL --class=nvim --title=nvim -e nvim -- %F" Terminal=false Type=Application Keywords=Text;editor; diff --git a/bin/omarchy-cmd-screenrecord b/bin/omarchy-cmd-screenrecord index 29fda33d..ee4622f2 100755 --- a/bin/omarchy-cmd-screenrecord +++ b/bin/omarchy-cmd-screenrecord @@ -15,7 +15,7 @@ SCOPE="$1" AUDIO=$([[ $2 == "audio" ]] && echo "--audio") start_screenrecording() { - filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4" + local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4" if lspci | grep -qi 'nvidia'; then wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" & @@ -47,7 +47,8 @@ screenrecording_active() { if screenrecording_active; then stop_screenrecording elif [[ "$SCOPE" == "output" ]]; then - start_screenrecording + output=$(slurp -o) || exit 1 + start_screenrecording -g "$output" else region=$(slurp) || exit 1 start_screenrecording -g "$region" diff --git a/bin/omarchy-cmd-screensaver b/bin/omarchy-cmd-screensaver index e336c8b0..70202bf1 100755 --- a/bin/omarchy-cmd-screensaver +++ b/bin/omarchy-cmd-screensaver @@ -18,7 +18,7 @@ hyprctl keyword cursor:invisible true while true; do effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1) tte -i ~/.config/omarchy/branding/screensaver.txt \ - --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \ + --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 1)) --anchor-canvas c --anchor-text c \ "$effect" & while pgrep -x tte >/dev/null; do diff --git a/bin/omarchy-install-docker-dbs b/bin/omarchy-install-docker-dbs index f7b624ad..112af1e2 100755 --- a/bin/omarchy-install-docker-dbs +++ b/bin/omarchy-install-docker-dbs @@ -3,7 +3,7 @@ options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB") if [[ "$#" -eq 0 ]]; then - choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select databases (space to select, return to install, esc to cancel)") || main_menu + choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select database (return to install, esc to cancel)") || main_menu else choices="$@" fi diff --git a/bin/omarchy-launch-webapp b/bin/omarchy-launch-webapp index 0276d966..441748ea 100755 --- a/bin/omarchy-launch-webapp +++ b/bin/omarchy-launch-webapp @@ -3,7 +3,7 @@ browser=$(xdg-settings get default-web-browser) case $browser in -google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;; +google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;; *) browser="chromium.desktop" ;; esac diff --git a/bin/omarchy-menu b/bin/omarchy-menu index f00ec35f..aa7f6d80 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -451,9 +451,9 @@ show_system_menu() { *Lock*) omarchy-lock-screen ;; *Screensaver*) omarchy-launch-screensaver force ;; *Suspend*) systemctl suspend ;; - *Relaunch*) sudo systemctl restart sddm ;; - *Restart*) systemctl reboot ;; - *Shutdown*) systemctl poweroff ;; + *Relaunch*) omarchy-state clear relaunch-required && sudo systemctl restart sddm ;; + *Restart*) omarchy-state clear re*-required && systemctl reboot ;; + *Shutdown*) omarchy-state clear re*-required && systemctl poweroff ;; *) back_to show_main_menu ;; esac } diff --git a/bin/omarchy-menu-keybindings b/bin/omarchy-menu-keybindings index 1d1b40ac..cd1a9b54 100755 --- a/bin/omarchy-menu-keybindings +++ b/bin/omarchy-menu-keybindings @@ -3,6 +3,69 @@ # A script to display Hyprland keybindings defined in your configuration # using walker for an interactive search menu. +declare -A KEYCODE_SYM_MAP + +build_keymap_cache() { + local keymap + keymap="$(xkbcli compile-keymap)" || { + echo "Failed to compile keymap" >&2 + return 1 + } + + while IFS=, read -r code sym; do + [[ -z "$code" || -z "$sym" ]] && continue + KEYCODE_SYM_MAP["$code"]="$sym" + done < <( + awk ' + BEGIN { sec = "" } + /xkb_keycodes/ { sec = "codes"; next } + /xkb_symbols/ { sec = "syms"; next } + sec == "codes" { + if (match($0, /<([A-Za-z0-9_]+)>\s*=\s*([0-9]+)\s*;/, m)) code_by_name[m[1]] = m[2] + } + sec == "syms" { + if (match($0, /key\s*<([A-Za-z0-9_]+)>\s*\{\s*\[\s*([^, \]]+)/, m)) sym_by_name[m[1]] = m[2] + } + END { + for (k in code_by_name) { + c = code_by_name[k] + s = sym_by_name[k] + if (c != "" && s != "" && s != "NoSymbol") print c "," s + } + } + ' <<<"$keymap" + ) +} + +lookup_keycode_cached() { + printf '%s\n' "${KEYCODE_SYM_MAP[$1]}" +} + +parse_keycodes() { + local start end elapsed + [[ "${DEBUG:-0}" == "1" ]] && start=$(date +%s.%N) + while IFS= read -r line; do + if [[ "$line" =~ code:([0-9]+) ]]; then + code="${BASH_REMATCH[1]}" + symbol=$(lookup_keycode_cached "$code" "$XKB_KEYMAP_CACHE") + echo "${line/code:${code}/$symbol}" + else + echo "$line" + fi + done + + if [[ "$DEBUG" == "1" ]]; then + end=$(date +%s.%N) + # fall back to awk if bc is missing + if command -v bc >/dev/null 2>&1; then + elapsed=$(echo "$end - $start" | bc) + else + elapsed=$(awk -v s="$start" -v e="$end" 'BEGIN{printf "%.6f", (e - s)}') + fi + echo "[DEBUG] parse_keycodes elapsed: ${elapsed}s" >&2 + fi +} + # Fetch dynamic keybindings from Hyprland # # Also do some pre-processing: @@ -11,30 +74,30 @@ # - Map numeric modifier key mask to a textual rendition # - Output comma-separated values that the parser can understand dynamic_bindings() { - hyprctl -j binds | \ - jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' | \ + hyprctl -j binds | + jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' | sed -r \ - -e 's/null//' \ - -e 's,~/.local/share/omarchy/bin/,,' \ - -e 's,uwsm app -- ,,' \ - -e 's/@0//' \ - -e 's/,@/,code:/' \ - -e 's/^0,/,/' \ - -e 's/^1,/SHIFT,/' \ - -e 's/^4,/CTRL,/' \ - -e 's/^5,/SHIFT CTRL,/' \ - -e 's/^8,/ALT,/' \ - -e 's/^9,/SHIFT ALT,/' \ - -e 's/^12,/CTRL ALT,/' \ - -e 's/^13,/SHIFT CTRL ALT,/' \ - -e 's/^64,/SUPER,/' \ - -e 's/^65,/SUPER SHIFT,/' \ - -e 's/^68,/SUPER CTRL,/' \ - -e 's/^69,/SUPER SHIFT CTRL,/' \ - -e 's/^72,/SUPER ALT,/' \ - -e 's/^73,/SUPER SHIFT ALT,/' \ - -e 's/^76,/SUPER CTRL ALT,/' \ - -e 's/^77,/SUPER SHIFT CTRL ALT,/' + -e 's/null//' \ + -e 's,~/.local/share/omarchy/bin/,,' \ + -e 's,uwsm app -- ,,' \ + -e 's/@0//' \ + -e 's/,@/,code:/' \ + -e 's/^0,/,/' \ + -e 's/^1,/SHIFT,/' \ + -e 's/^4,/CTRL,/' \ + -e 's/^5,/SHIFT CTRL,/' \ + -e 's/^8,/ALT,/' \ + -e 's/^9,/SHIFT ALT,/' \ + -e 's/^12,/CTRL ALT,/' \ + -e 's/^13,/SHIFT CTRL ALT,/' \ + -e 's/^64,/SUPER,/' \ + -e 's/^65,/SUPER SHIFT,/' \ + -e 's/^68,/SUPER CTRL,/' \ + -e 's/^69,/SUPER SHIFT CTRL,/' \ + -e 's/^72,/SUPER ALT,/' \ + -e 's/^73,/SUPER SHIFT ALT,/' \ + -e 's/^76,/SUPER CTRL ALT,/' \ + -e 's/^77,/SUPER SHIFT CTRL ALT,/' } # Parse and format keybindings @@ -86,8 +149,10 @@ parse_bindings() { monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height') menu_height=$((monitor_height * 40 / 100)) -dynamic_bindings | \ - sort -u | \ - parse_bindings | \ - walker --dmenu --theme keybindings -p 'Keybindings' -w 800 -h "$menu_height" +build_keymap_cache +dynamic_bindings | + sort -u | + parse_keycodes | + parse_bindings | + walker --dmenu --theme keybindings -p 'Keybindings' -w 800 -h "$menu_height" diff --git a/bin/omarchy-restart-pipewire b/bin/omarchy-restart-pipewire index f6a7260b..f26ee09e 100755 --- a/bin/omarchy-restart-pipewire +++ b/bin/omarchy-restart-pipewire @@ -1,4 +1,4 @@ #!/bin/bash -echo -e "Restarting pirewire audio service...\n" +echo -e "Restarting pipewire audio service...\n" systemctl --user restart pipewire.service diff --git a/bin/omarchy-setup-fingerprint b/bin/omarchy-setup-fingerprint index 422fb1e4..93b70e6d 100755 --- a/bin/omarchy-setup-fingerprint +++ b/bin/omarchy-setup-fingerprint @@ -20,7 +20,7 @@ print_info() { } check_fingerprint_hardware() { - if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan|validity'; then + if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan|validity|FPC'; then print_error "\nNo fingerprint sensor detected." return 1 fi diff --git a/bin/omarchy-theme-set-browser b/bin/omarchy-theme-set-browser index 759d2c4e..655ebe31 100755 --- a/bin/omarchy-theme-set-browser +++ b/bin/omarchy-theme-set-browser @@ -4,16 +4,17 @@ CHROMIUM_THEME=~/.config/omarchy/current/theme/chromium.theme if omarchy-cmd-present chromium || omarchy-cmd-present brave; then if [[ -f $CHROMIUM_THEME ]]; then - rgb=$(<$CHROMIUM_THEME) + THEME_RGB_COLOR=$(<$CHROMIUM_THEME) THEME_HEX_COLOR=$(printf '#%02x%02x%02x' ${rgb//,/ }) else # Use a default, neutral grey if theme doesn't have a color + THEME_RGB_COLOR="28,32,39" THEME_HEX_COLOR="#1c2027" fi if omarchy-cmd-present chromium; then - echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null - chromium --refresh-platform-policy --no-startup-window + rm -f /etc/chromium/policies/managed/color.json + chromium --no-startup-window --set-theme-color="$THEME_RGB_COLOR" fi if omarchy-cmd-present brave; then diff --git a/bin/omarchy-tui-install b/bin/omarchy-tui-install index 121ce940..916db654 100755 --- a/bin/omarchy-tui-install +++ b/bin/omarchy-tui-install @@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" </dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then +product_name="$(cat /sys/class/dmi/id/product_name 2>/dev/null)" +if [[ "$product_name" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then echo "Detected MacBook with SPI keyboard" sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms - echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null + if [[ "$product_name" == "MacBook8,1" ]]; then + echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null + else + echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null + fi fi diff --git a/install/config/mimetypes.sh b/install/config/mimetypes.sh index 48bb8cfa..ee662f55 100644 --- a/install/config/mimetypes.sh +++ b/install/config/mimetypes.sh @@ -33,3 +33,6 @@ xdg-mime default mpv.desktop video/x-ms-asf xdg-mime default mpv.desktop video/x-ogm+ogg xdg-mime default mpv.desktop video/x-theora+ogg xdg-mime default mpv.desktop application/ogg + +# Use Hey for mailto: links +xdg-mime default HEY.desktop x-scheme-handler/mailto diff --git a/install/config/sudoless-asdcontrol.sh b/install/config/sudoless-asdcontrol.sh index 120c6fc2..5ae03563 100644 --- a/install/config/sudoless-asdcontrol.sh +++ b/install/config/sudoless-asdcontrol.sh @@ -1,3 +1,3 @@ # Setup sudo-less controls for controlling brightness on Apple Displays -echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol +echo "$USER ALL=(ALL) NOPASSWD: /usr/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol sudo chmod 440 /etc/sudoers.d/asdcontrol diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages index 8d671468..ba396a1d 100644 --- a/install/omarchy-base.packages +++ b/install/omarchy-base.packages @@ -69,6 +69,7 @@ mariadb-libs mise mpv nautilus +gnome-disk-utility noto-fonts noto-fonts-cjk noto-fonts-emoji diff --git a/install/packaging/webapps.sh b/install/packaging/webapps.sh index df20bd3e..c5f7350b 100644 --- a/install/packaging/webapps.sh +++ b/install/packaging/webapps.sh @@ -1,4 +1,4 @@ -omarchy-webapp-install "HEY" https://app.hey.com HEY.png +omarchy-webapp-install "HEY" https://app.hey.com HEY.png "omarchy-webapp-handler-hey %u" "x-scheme-handler/mailto" omarchy-webapp-install "Basecamp" https://launchpad.37signals.com Basecamp.png omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ WhatsApp.png omarchy-webapp-install "Google Photos" https://photos.google.com/ "Google Photos.png" diff --git a/install/preflight/guard.sh b/install/preflight/guard.sh index 2444194e..8de25181 100644 --- a/install/preflight/guard.sh +++ b/install/preflight/guard.sh @@ -18,6 +18,9 @@ done # Must be x86 only to fully work [ "$(uname -m)" != "x86_64" ] && abort "x86_64 CPU" +# Must have secure boot disabled +bootctl status 2>/dev/null | grep -q 'Secure Boot: disabled' || abort "Secure Boot disabled" + # Must not have Gnome or KDE already install pacman -Qe gnome-shell &>/dev/null && abort "Fresh + Vanilla Arch" pacman -Qe plasma-desktop &>/dev/null && abort "Fresh + Vanilla Arch" diff --git a/migrations/1755870033.sh b/migrations/1755870033.sh index fde865be..d7b6e8f9 100644 --- a/migrations/1755870033.sh +++ b/migrations/1755870033.sh @@ -1,5 +1,5 @@ echo "Use current terminal shell cwd for new terminal working directories" if ! grep -q "working-directory" ~/.config/hypr/bindings.conf; then - sed -i '/bindd = SUPER, return, Terminal, exec, \$terminal/ s|$| --working-directory=$(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf + sed -i '/bindd = SUPER, RETURN, Terminal, exec, \$terminal/ s|$| --working-directory=$(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf fi diff --git a/migrations/1758081785.sh b/migrations/1758081785.sh new file mode 100644 index 00000000..40e062a9 --- /dev/null +++ b/migrations/1758081785.sh @@ -0,0 +1,4 @@ +echo "Add live themeing to neovim" + +cp -f $OMARCHY_PATH/config/nvim/lua/plugins/all-themes.lua ~/.config/nvim/lua/plugins/ +cp -f $OMARCHY_PATH/config/nvim/lua/plugins/omarchy-theme-hotreload.lua ~/.config/nvim/lua/plugins/ diff --git a/migrations/1758436991.sh b/migrations/1758436991.sh new file mode 100644 index 00000000..b9a2e7b5 --- /dev/null +++ b/migrations/1758436991.sh @@ -0,0 +1,17 @@ +echo "Fix Disk Usage and Docker TUIs" + +APP_DIR="$HOME/.local/share/applications" +ICON_DIR="$APP_DIR/icons" + +# Don't use omarchy-tui-remove to preserve icons + +if [[ -f "$APP_DIR/Docker.desktop" ]]; then + rm "$APP_DIR/Docker.desktop" + omarchy-tui-install "Docker" "lazydocker" tile "$ICON_DIR/Docker.png" +fi + +if [[ -f "$APP_DIR/Disk Usage.desktop" ]]; then + rm "$APP_DIR/Disk Usage.desktop" + omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float "$ICON_DIR/Disk Usage.png" +fi + diff --git a/migrations/1758564460.sh b/migrations/1758564460.sh new file mode 100644 index 00000000..f0b10693 --- /dev/null +++ b/migrations/1758564460.sh @@ -0,0 +1,2 @@ +echo "Enable fast shutdown" +source $OMARCHY_PATH/install/config/fast-shutdown.sh diff --git a/migrations/1759093827.sh b/migrations/1759093827.sh new file mode 100644 index 00000000..69cf8963 --- /dev/null +++ b/migrations/1759093827.sh @@ -0,0 +1,3 @@ +echo "Adding hidden entries for electron apps" + +cp $OMARCHY_PATH/applications/hidden/electron*.desktop ~/.local/share/applications/ diff --git a/migrations/1759691413.sh b/migrations/1759691413.sh new file mode 100644 index 00000000..37fefa7c --- /dev/null +++ b/migrations/1759691413.sh @@ -0,0 +1,5 @@ +echo "Correct path for sudoless asdcontrol for working Apple Display hotkeys" + +if [[ $(command -v asdcontrol) == "/usr/bin/asdcontrol" ]]; then + echo "$USER ALL=(ALL) NOPASSWD: /usr/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol +fi diff --git a/migrations/1759693134.sh b/migrations/1759693134.sh new file mode 100644 index 00000000..015fd8e0 --- /dev/null +++ b/migrations/1759693134.sh @@ -0,0 +1,3 @@ +echo "Fix opening in nvim from files manager" + +cp -f $OMARCHY_PATH/applications/nvim.desktop ~/.local/share/applications/nvim.desktop diff --git a/migrations/1759694076.sh b/migrations/1759694076.sh new file mode 100644 index 00000000..084d8e2b --- /dev/null +++ b/migrations/1759694076.sh @@ -0,0 +1,4 @@ +echo "Hide OpenJDK applications from app launcher" + +cp $OMARCHY_PATH/applications/hidden/*openjdk.desktop ~/.local/share/applications/ + diff --git a/themes/catppuccin-latte/neovim.lua b/themes/catppuccin-latte/neovim.lua index 07a53cf8..53eaf45c 100644 --- a/themes/catppuccin-latte/neovim.lua +++ b/themes/catppuccin-latte/neovim.lua @@ -3,12 +3,9 @@ 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, + opts = { + flavour = "latte", + }, }, { "LazyVim/LazyVim", diff --git a/themes/catppuccin/neovim.lua b/themes/catppuccin/neovim.lua index dbe34f5e..a8683876 100644 --- a/themes/catppuccin/neovim.lua +++ b/themes/catppuccin/neovim.lua @@ -1,4 +1,9 @@ return { + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + }, { "LazyVim/LazyVim", opts = { diff --git a/themes/osaka-jade/neovim.lua b/themes/osaka-jade/neovim.lua index b2bd3f20..b3c9edc5 100644 --- a/themes/osaka-jade/neovim.lua +++ b/themes/osaka-jade/neovim.lua @@ -1,9 +1,13 @@ return { - "ribru17/bamboo.nvim", - lazy = false, - priority = 1000, - config = function() - require("bamboo").setup({}) - require("bamboo").load() - end, + { + "ribru17/bamboo.nvim", + priority = 1000, + opts = {}, + }, + { + "LazyVim/LazyVim", + opts = { + colorscheme = "bamboo", + }, + }, } diff --git a/themes/ristretto/neovim.lua b/themes/ristretto/neovim.lua index 38959d47..d862d161 100644 --- a/themes/ristretto/neovim.lua +++ b/themes/ristretto/neovim.lua @@ -1,31 +1,14 @@ return { - { - "gthelding/monokai-pro.nvim", - config = function() - require("monokai-pro").setup({ - filter = "ristretto", - override = function() - return { - NonText = { fg = "#948a8b" }, - MiniIconsGrey = { fg = "#948a8b" }, - MiniIconsRed = { fg = "#fd6883" }, - MiniIconsBlue = { fg = "#85dacc" }, - MiniIconsGreen = { fg = "#adda78" }, - MiniIconsYellow = { fg = "#f9cc6c" }, - MiniIconsOrange = { fg = "#f38d70" }, - MiniIconsPurple = { fg = "#a8a9eb" }, - MiniIconsAzure = { fg = "#a8a9eb" }, - MiniIconsCyan = { fg = "#85dacc" }, -- same value as MiniIconsBlue for consistency - } - end, - }) - vim.cmd([[colorscheme monokai-pro]]) - end, - }, - { - "LazyVim/LazyVim", - opts = { - colorscheme = "monokai-pro", - }, - }, + { + "loctvl842/monokai-pro.nvim", + opts = { + filter = "ristretto", + }, + }, + { + "LazyVim/LazyVim", + opts = { + colorscheme = "monokai-pro", + }, + }, } diff --git a/themes/rose-pine/eza.yml b/themes/rose-pine/eza.yml index cc65ef0e..6597cb01 100644 --- a/themes/rose-pine/eza.yml +++ b/themes/rose-pine/eza.yml @@ -1,123 +1,121 @@ -# see https://github.com/eza-community/eza-themes/blob/main/themes/rose-pine.yml +# see https://github.com/eza-community/eza-themes/blob/main/themes/rose-pine-dawn.yml colourful: true # Colors are in format of: # color/paletteRef (Description) #color code -# Gold (Terminal Yellow) #f6c177 -# Love (Terminal Red) #eb6f92 -# Rose (Terminal Cyan) #ebbcba -# Base (Primary Background) #191724 -# Iris (Terminal Magenta) #c4a7e7 -# Foam (Terminal Blue) #9ccfd8 -# Pine (Terminal Green) #31748f -# Muted (Low Contrast Foreground) #6e6a86 -# Surface (Secondary Background Atop Base) #1f1d2e -# Overlay (Tertiary Background Atop Surface) #26233a -# Subtle (Medium Contrast Foreground) #908caa -# Text (High Contrast Foreground) #e0def4 -# Highlight Low (Low Contrast Highlight) #21202e -# Highlight Med (Medium Contrast Highlight) #403d52 -# Highlight High (High Contrast Highlight) #524f67 +# Gold (Terminal Yellow) #ea9d34 +# Love (Terminal Red) #b4637a +# Rose (Terminal Cyan) #d7827e +# Base (Primary Background) #faf4ed +# Iris (Terminal Magenta) #907aa9 +# Foam (Terminal Blue) #56949f +# Pine (Terminal Green) #286983 +# Text (High contrast foreground) #575279 +# Muted (Low Contrast Foreground) #9893a5 +# Subtle (Medium Contrast Foreground) #797593 +# Highlight Low (Low contrast highlight) #f4ede8 +# Highlight Med (Medium Contrast Highlight) #dfdad9 +# Highlight High (High Contrast Highlight) #cecacd filekinds: - normal: {foreground: "#e0def4"} - directory: {foreground: "#9ccfd8"} - symlink: {foreground: "#524f67"} - pipe: {foreground: "#908caa"} - block_device: {foreground: "#ebbcba"} - char_device: {foreground: "#f6c177"} - socket: {foreground: "#21202e"} - special: {foreground: "#c4a7e7"} - executable: {foreground: "#c4a7e7"} - mount_point: {foreground: "#403d52"} + normal: { foreground: "#575279" } + directory: { foreground: "#56949f" } + symlink: { foreground: "#cecacd" } + pipe: { foreground: "#797593" } + block_device: { foreground: "#d7827e" } + char_device: { foreground: "#ea9d34" } + socket: { foreground: "#f4ede8" } + special: { foreground: "#907aa9" } + executable: { foreground: "#907aa9" } + mount_point: { foreground: "#dfdad9" } perms: - user_read: {foreground: "#908caa"} - user_write: {foreground: "#403d52"} - user_execute_file: {foreground: "#c4a7e7"} - user_execute_other: {foreground: "#c4a7e7"} - group_read: {foreground: "#908caa"} - group_write: {foreground: "#403d52"} - group_execute: {foreground: "#c4a7e7"} - other_read: {foreground: "#908caa"} - other_write: {foreground: "#403d52"} - other_execute: {foreground: "#c4a7e7"} - special_user_file: {foreground: "#c4a7e7"} - special_other: {foreground: "#403d52"} - attribute: {foreground: "#908caa"} + user_read: { foreground: "#797593" } + user_write: { foreground: "#d7827e" } + user_execute_file: { foreground: "#907aa9" } + user_execute_other: { foreground: "#907aa9" } + group_read: { foreground: "#797593" } + group_write: { foreground: "#d7827e" } + group_execute: { foreground: "#907aa9" } + other_read: { foreground: "#797593" } + other_write: { foreground: "#d7827e" } + other_execute: { foreground: "#907aa9" } + special_user_file: { foreground: "#907aa9" } + special_other: { foreground: "#d7827e" } + attribute: { foreground: "#797593" } size: - major: {foreground: "#908caa"} - minor: {foreground: "#9ccfd8"} - number_byte: {foreground: "#908caa"} - number_kilo: {foreground: "#524f67"} - number_mega: {foreground: "#31748f"} - number_giga: {foreground: "#c4a7e7"} - number_huge: {foreground: "#c4a7e7"} - unit_byte: {foreground: "#908caa"} - unit_kilo: {foreground: "#31748f"} - unit_mega: {foreground: "#c4a7e7"} - unit_giga: {foreground: "#c4a7e7"} - unit_huge: {foreground: "#9ccfd8"} + major: { foreground: "#797593" } + minor: { foreground: "#56949f" } + number_byte: { foreground: "#797593" } + number_kilo: { foreground: "#cecacd" } + number_mega: { foreground: "#286983" } + number_giga: { foreground: "#907aa9" } + number_huge: { foreground: "#907aa9" } + unit_byte: { foreground: "#797593" } + unit_kilo: { foreground: "#286983" } + unit_mega: { foreground: "#907aa9" } + unit_giga: { foreground: "#907aa9" } + unit_huge: { foreground: "#56949f" } users: - user_you: {foreground: "#f6c177"} - user_root: {foreground: "#eb6f92"} - user_other: {foreground: "#c4a7e7"} - group_yours: {foreground: "#524f67"} - group_other: {foreground: "#6e6a86"} - group_root: {foreground: "#eb6f92"} + user_you: { foreground: "#ea9d34" } + user_root: { foreground: "#b4637a" } + user_other: { foreground: "#907aa9" } + group_yours: { foreground: "#cecacd" } + group_other: { foreground: "#9893a5" } + group_root: { foreground: "#b4637a" } links: - normal: {foreground: "#9ccfd8"} - multi_link_file: {foreground: "#31748f"} + normal: { foreground: "#56949f" } + multi_link_file: { foreground: "#286983" } git: - new: {foreground: "#9ccfd8"} - modified: {foreground: "#f6c177"} - deleted: {foreground: "#eb6f92"} - renamed: {foreground: "#31748f"} - typechange: {foreground: "#c4a7e7"} - ignored: {foreground: "#6e6a86"} - conflicted: {foreground: "#ebbcba"} + new: { foreground: "#56949f" } + modified: { foreground: "#ea9d34" } + deleted: { foreground: "#b4637a" } + renamed: { foreground: "#286983" } + typechange: { foreground: "#907aa9" } + ignored: { foreground: "#9893a5" } + conflicted: { foreground: "#d7827e" } git_repo: - branch_main: {foreground: "#908caa"} - branch_other: {foreground: "#c4a7e7"} - git_clean: {foreground: "#9ccfd8"} - git_dirty: {foreground: "#eb6f92"} + branch_main: { foreground: "#797593" } + branch_other: { foreground: "#907aa9" } + git_clean: { foreground: "#56949f" } + git_dirty: { foreground: "#b4637a" } security_context: - colon: {foreground: "#908caa"} - user: {foreground: "#9ccfd8"} - role: {foreground: "#c4a7e7"} - typ: {foreground: "#6e6a86"} - range: {foreground: "#c4a7e7"} + colon: { foreground: "#797593" } + user: { foreground: "#56949f" } + role: { foreground: "#907aa9" } + typ: { foreground: "#9893a5" } + range: { foreground: "#907aa9" } file_type: - image: {foreground: "#f6c177"} - video: {foreground: "#eb6f92"} - music: {foreground: "#9ccfd8"} - lossless: {foreground: "#6e6a86"} - crypto: {foreground: "#403d52"} - document: {foreground: "#908caa"} - compressed: {foreground: "#c4a7e7"} - temp: {foreground: "#ebbcba"} - compiled: {foreground: "#31748f"} - build: {foreground: "#6e6a86"} - source: {foreground: "#ebbcba"} + image: { foreground: "#ea9d34" } + video: { foreground: "#b4637a" } + music: { foreground: "#56949f" } + lossless: { foreground: "#9893a5" } + crypto: { foreground: "#dfdad9" } + document: { foreground: "#797593" } + compressed: { foreground: "#907aa9" } + temp: { foreground: "#d7827e" } + compiled: { foreground: "#286983" } + build: { foreground: "#9893a5" } + source: { foreground: "#d7827e" } -punctuation: {foreground: "#524f67"} -date: {foreground: "#31748f"} -inode: {foreground: "#908caa"} -blocks: {foreground: "#6e6a86"} -header: {foreground: "#908caa"} -octal: {foreground: "#9ccfd8"} -flags: {foreground: "#c4a7e7"} +punctuation: { foreground: "#cecacd" } +date: { foreground: "#286983" } +inode: { foreground: "#797593" } +blocks: { foreground: "#9893a5" } +header: { foreground: "#797593" } +octal: { foreground: "#56949f" } +flags: { foreground: "#907aa9" } -symlink_path: {foreground: "#9ccfd8"} -control_char: {foreground: "#31748f"} -broken_symlink: {foreground: "#eb6f92"} -broken_path_overlay: {foreground: "#524f67"} +symlink_path: { foreground: "#56949f" } +control_char: { foreground: "#286983" } +broken_symlink: { foreground: "#b4637a" } +broken_path_overlay: { foreground: "#cecacd" } diff --git a/themes/tokyo-night/neovim.lua b/themes/tokyo-night/neovim.lua index dad2d30b..39327c9b 100644 --- a/themes/tokyo-night/neovim.lua +++ b/themes/tokyo-night/neovim.lua @@ -1,8 +1,12 @@ return { + { + "folke/tokyonight.nvim", + priority = 1000, + }, { "LazyVim/LazyVim", opts = { - colorscheme = "tokyonight", + colorscheme = "tokyonight-night", }, }, } diff --git a/version b/version new file mode 100644 index 00000000..1fe43e4f --- /dev/null +++ b/version @@ -0,0 +1 @@ +3.0.0-RC