diff --git a/dot_config/alacritty/alacritty.toml b/dot_config/alacritty/alacritty.toml index 85a8ea3..fb8760a 100644 --- a/dot_config/alacritty/alacritty.toml +++ b/dot_config/alacritty/alacritty.toml @@ -16,5 +16,7 @@ decorations = "None" [keyboard] bindings = [ -{ key = "F11", action = "ToggleFullscreen" } +{ key = "F11", action = "ToggleFullscreen" }, +{ key = "Insert", mods = "Shift", action = "Paste" }, +{ key = "Insert", mods = "Control", action = "Copy" } ] diff --git a/dot_config/hypr/bindings.conf b/dot_config/hypr/bindings.conf index fd2f249..fcfd83e 100644 --- a/dot_config/hypr/bindings.conf +++ b/dot_config/hypr/bindings.conf @@ -1,11 +1,12 @@ # Application bindings -$terminal = uwsm app -- alacritty +$terminal = uwsm-app -- $TERMINAL $browser = omarchy-launch-browser 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 SHIFT, B, Browser (private), exec, $browser --private +bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify bindd = SUPER, N, Notes, exec, heynote bindd = SUPER, T, Activity, exec, $terminal -e btop bindd = SUPER ALT, D, Docker, exec, $terminal -e lazydocker @@ -15,7 +16,7 @@ bindd = SUPER, A, Claude, exec, omarchy-launch-webapp "https://claude.ai/new" bindd = SUPER, E, Email, exec, omarchy-launch-webapp "https://mail.google.com/mail/u/0/" bindd = SUPER, Y, YouTube, exec, omarchy-launch-webapp "https://youtube.com/" bindd = SUPER, G, GitLab, exec, omarchy-launch-webapp "https://gitlab.modg.net/" -bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-webapp "https://messages.google.com/web/conversations" +bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-or-focus-webapp "Google Messages" "https://messages.google.com/web/conversations" bindd = SUPER, O, modgoffice, exec, omarchy-launch-webapp "https://office.modg.org" # lazy apps: Launch if not currently running, otherwise just switch to that app diff --git a/dot_config/hypr/hyprland.conf b/dot_config/hypr/hyprland.conf index b8c4fb4..c0df23a 100644 --- a/dot_config/hypr/hyprland.conf +++ b/dot_config/hypr/hyprland.conf @@ -16,6 +16,7 @@ source = ~/.config/hypr/monitors.conf source = ~/.config/hypr/input.conf source = ~/.config/hypr/bindings.conf source = ~/.config/hypr/envs.conf +source = ~/.config/hypr/looknfeel.conf source = ~/.config/hypr/autostart.conf source = ~/.config/hypr/windows.conf diff --git a/dot_config/hypr/hyprlock.conf b/dot_config/hypr/hyprlock.conf index f3e8159..063d793 100644 --- a/dot_config/hypr/hyprlock.conf +++ b/dot_config/hypr/hyprlock.conf @@ -3,6 +3,8 @@ source = ~/.config/omarchy/current/theme/hyprlock.conf background { monitor = color = $color + path = ~/.config/omarchy/current/background + blur_passes = 3 } animations { @@ -11,7 +13,7 @@ animations { input-field { monitor = - size = 600, 100 + size = 650, 100 position = 0, 0 halign = center valign = center @@ -20,12 +22,12 @@ input-field { outer_color = $outer_color outline_thickness = 4 - font_family = CaskaydiaMono Nerd Font + font_family = CaskaydiaMono Nerd Font Propo font_color = $font_color - placeholder_text =   Enter Password 󰈷  + placeholder_text = Enter Password 󰈷 check_color = $check_color - fail_text = $PAMFAIL ($ATTEMPTS) + fail_text = $FAIL ($ATTEMPTS) rounding = 0 shadow_passes = 0 diff --git a/dot_config/hypr/input.conf b/dot_config/hypr/input.conf index 1e559bb..fc9e591 100644 --- a/dot_config/hypr/input.conf +++ b/dot_config/hypr/input.conf @@ -29,7 +29,7 @@ input { } # Scroll faster in the terminal -windowrule = scrolltouchpad 1.5, class:Alacritty +windowrule = scrolltouchpad 1.5, tag:terminal device { name = pixa3854:00-093a:0274-touchpad diff --git a/dot_config/mise/config.toml b/dot_config/mise/config.toml index 0bd4890..ab77512 100644 --- a/dot_config/mise/config.toml +++ b/dot_config/mise/config.toml @@ -3,14 +3,13 @@ idiomatic_version_file_enable_tools = ["ruby"] experimental = true [settings.ruby] -ruby_build_opts = "CC=gcc-14 CXX=g++-14" [tools] chezmoi = "latest" cosign = "latest" "pipx:modgcli" = "latest" mold = "latest" -node = "lts" +node = "latest" rust = "latest" uv = "latest" yay = "latest" diff --git a/dot_config/waybar/config.jsonc b/dot_config/waybar/config.jsonc index eeff61b..ed06495 100644 --- a/dot_config/waybar/config.jsonc +++ b/dot_config/waybar/config.jsonc @@ -5,7 +5,7 @@ "spacing": 0, "height": 26, "modules-left": ["custom/omarchy", "hyprland/workspaces"], - "modules-center": ["clock", "custom/update"], + "modules-center": ["clock", "custom/update", "custom/screenrecording-indicator"], "modules-right": [ "group/tray-expander", "bluetooth", @@ -17,10 +17,31 @@ "hyprland/workspaces": { "on-click": "activate", "format": "{icon}", + "format-icons": { + "default": "", + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "active": "󱓻" + }, + "persistent-workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [] + } }, "custom/omarchy": { "format": "\ue900", "on-click": "omarchy-menu", + "on-click-right": "omarchy-launch-terminal", "tooltip-format": "Omarchy Menu\n\nSuper + Alt + Space" }, "custom/update": { @@ -28,32 +49,33 @@ "exec": "omarchy-update-available", "on-click": "omarchy-launch-floating-terminal-with-presentation omarchy-update", "tooltip-format": "Omarchy update available", - "interval": 3600 + "signal": 7, + "interval": 21600 }, "cpu": { "interval": 5, "format": "󰍛", - "on-click": "alacritty -e btop" + "on-click": "$TERMINAL -e btop" }, "clock": { - "format": "{:%A %H:%M}", - "format-alt": "{:%d %B W%V %Y}", + "format": "{:L%A %H:%M}", + "format-alt": "{:L%d %B W%V %Y}", "tooltip": false, - "on-click-right": "omarchy-cmd-tzupdate" + "on-click-right": "omarchy-launch-floating-terminal-with-presentation omarchy-tz-select" }, "network": { "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"], "format": "{icon}", "format-wifi": "{icon}", "format-ethernet": "󰀂", - "format-disconnected": "󰖪", + "format-disconnected": "󰤮", "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}", "tooltip-format-ethernet": "⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}", "tooltip-format-disconnected": "Disconnected", "interval": 3, "spacing": 1, - "on-click": "alacritty --class=Impala -e impala" + "on-click": "omarchy-launch-wifi" }, "battery": { "format": "{capacity}% {icon}", @@ -83,11 +105,11 @@ }, "pulseaudio": { "format": "{icon}", - "on-click": "alacritty --class=Wiremix -e wiremix", + "on-click": "$TERMINAL --class=Wiremix -e wiremix", "on-click-right": "pamixer -t", "tooltip-format": "Playing at {volume}%", "scroll-step": 5, - "format-muted": "󰝟", + "format-muted": "", "format-icons": { "default": ["", "", ""] } @@ -101,11 +123,17 @@ "modules": ["custom/expand-icon", "tray"] }, "custom/expand-icon": { - "format": " ", + "format": "", "tooltip": false }, + "custom/screenrecording-indicator": { + "on-click": "omarchy-cmd-screenrecord", + "exec": "$OMARCHY_PATH/default/waybar/indicators/screen-recording.sh", + "signal": 8, + "return-type": "json" + }, "tray": { "icon-size": 12, - "spacing": 12 + "spacing": 17 } } diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css index 37a283e..f2b1e9f 100644 --- a/dot_config/waybar/style.css +++ b/dot_config/waybar/style.css @@ -2,12 +2,12 @@ * { background-color: @background; - /* color: @foreground; */ + color: @foreground; border: none; border-radius: 0; min-height: 0; - font-family: CaskaydiaMono Nerd Font; + font-family: 'CaskaydiaMono Nerd Font'; font-size: 12px; } @@ -30,24 +30,30 @@ opacity: 0.5; } -#workspaces button.active { - color: #bfe28c; -} - -#tray, #cpu, #battery, -#network, -#bluetooth, #pulseaudio, #custom-omarchy, +#custom-screenrecording-indicator, #custom-update { min-width: 12px; margin: 0 7.5px; } +#tray { + margin-right: 16px; +} + +#bluetooth { + margin-right: 17px; +} + +#network { + margin-right: 13px; +} + #custom-expand-icon { - margin-right: 7px; + margin-right: 20px; } tooltip { @@ -65,3 +71,13 @@ tooltip { .hidden { opacity: 0; } + +#custom-screenrecording-indicator { + min-width: 12px; + margin-left: 8.75px; + font-size: 10px; +} + +#custom-screenrecording-indicator.active { + color: #a55555; +}