From 555751951a47b0bf67605394fe93c4b07bdddefb Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Sat, 22 Jun 2024 21:01:24 -0400 Subject: [PATCH] minor changes --- .config/hypr/config.d/keybinds.conf | 1 + .config/hypr/config.d/theme.conf | 3 +- .config/hypr/config.d/workspaces.conf | 20 +++++----- .config/waybar/style.css | 55 +++++++++++---------------- .zshrc | 1 + packages | 3 ++ 6 files changed, 39 insertions(+), 44 deletions(-) diff --git a/.config/hypr/config.d/keybinds.conf b/.config/hypr/config.d/keybinds.conf index 4c24083..f7ecf4e 100644 --- a/.config/hypr/config.d/keybinds.conf +++ b/.config/hypr/config.d/keybinds.conf @@ -28,3 +28,4 @@ bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notif bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard" bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy +bind = $mod, tab, hyprexpo:expo, toggle diff --git a/.config/hypr/config.d/theme.conf b/.config/hypr/config.d/theme.conf index 80ceae7..b67a69c 100644 --- a/.config/hypr/config.d/theme.conf +++ b/.config/hypr/config.d/theme.conf @@ -35,6 +35,7 @@ plugin { hyprbars { bar_height = 24 + bar_part_of_window = true bar_color = $base_color col.text = $text_color bar_text_size = 9 @@ -50,7 +51,7 @@ plugin { decoration { rounding = $radius - drop_shadow = no + drop_shadow = yes blur { enabled = true diff --git a/.config/hypr/config.d/workspaces.conf b/.config/hypr/config.d/workspaces.conf index 408b05f..c25a0a8 100644 --- a/.config/hypr/config.d/workspaces.conf +++ b/.config/hypr/config.d/workspaces.conf @@ -49,16 +49,16 @@ bind = $mod SHIFT, 0, movetoworkspacesilent, 10 # Move to tab -bind = $mod CONTROL, 1, hy3:focustab, index, 01 -bind = $mod CONTROL, 2, hy3:focustab, index, 02 -bind = $mod CONTROL, 3, hy3:focustab, index, 03 -bind = $mod CONTROL, 4, hy3:focustab, index, 04 -bind = $mod CONTROL, 5, hy3:focustab, index, 05 -bind = $mod CONTROL, 6, hy3:focustab, index, 06 -bind = $mod CONTROL, 7, hy3:focustab, index, 07 -bind = $mod CONTROL, 8, hy3:focustab, index, 08 -bind = $mod CONTROL, 9, hy3:focustab, index, 09 -bind = $mod CONTROL, 0, hy3:focustab, index, 10 +bind = LALT, 1, hy3:focustab, index, 01 +bind = LALT, 2, hy3:focustab, index, 02 +bind = LALT, 3, hy3:focustab, index, 03 +bind = LALT, 4, hy3:focustab, index, 04 +bind = LALT, 5, hy3:focustab, index, 05 +bind = LALT, 6, hy3:focustab, index, 06 +bind = LALT, 7, hy3:focustab, index, 07 +bind = LALT, 8, hy3:focustab, index, 08 +bind = LALT, 9, hy3:focustab, index, 09 +bind = LALT, 0, hy3:focustab, index, 10 bindn = , mouse:272, hy3:focustab, mouse bindn = , mouse_down, hy3:focustab, l, require_hovered diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 0d159fd..67b5e77 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,43 +1,32 @@ -* { - font-family: "JetBrains Mono", "Font Awesome 6 Pro", monospace; - font-size: 13.5px; - transition: none; - margin: 0; - padding: 0; -} +/** Base */ window#waybar { + font-family: "JetBrains Mono", "Font Awesome 6 Pro", monospace; + font-size: 13.5px; + color: #c7c6c3; background-color: transparent; } window#waybar > box { margin: 10px; margin-bottom: 0px; - padding: 0; - color: #c7c6c3; -} - -button { - border: none; - border-radius: 0; } .modules-left, .modules-right { - margin: 0; padding: 2px 0px; background-color: #14171d; border-radius: 4px; } +/** Workspaces */ + #workspaces { - padding: 0px 0px; + margin-left: 2px; } #workspaces button { all: initial; - box-shadow: inherit; - text-shadow: inherit; color: #c7c6c3; background-color: transparent; border-radius: 4px; @@ -58,6 +47,17 @@ button { background-color: #cc5c5c; } +/** Window */ + +window#waybar:not(.empty) #window { + padding: 0 10px; + border-left: 1px solid #4d4754; + color: #c7c6c3; + margin: 0 2px; +} + +/** Tray */ + #clock, #battery, #cpu, @@ -84,15 +84,12 @@ button { border: none; } -#window { - padding: 0 10px; - border-left: 1px solid #4d4754; - color: #c7c6c3; +#tray > .passive { + -gtk-icon-effect: dim; } -#window, -#workspaces { - margin: 0 4px; +#tray > .needs-attention { + -gtk-icon-effect: highlight; } #battery { @@ -140,11 +137,3 @@ button { #temperature.critical { color: #cc5c5c; } - -#tray > .passive { - -gtk-icon-effect: dim; -} - -#tray > .needs-attention { - -gtk-icon-effect: highlight; -} diff --git a/.zshrc b/.zshrc index 79cd1fd..70fe205 100644 --- a/.zshrc +++ b/.zshrc @@ -91,5 +91,6 @@ export PF_CUSTOM_LOGOS="/home/freya/.config/pfetch_logos" export WINEARCH=win32 export WINEPREFIX=/home/freya/.wine +export PWD="$HOME" pfetch diff --git a/packages b/packages index b079de3..1d70a3d 100644 --- a/packages +++ b/packages @@ -77,8 +77,10 @@ man-pages mangohud mesa-utils mesa-vdpau +mlocate mpv nasm +nautilus neofetch neovim network-manager-applet @@ -113,6 +115,7 @@ sassc sbctl sbsigntools slurp +socat sof-firmware starship steam