From f2b2a6a774ce072938019df3f9ae9e3cd0fd6e34 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Mon, 21 Aug 2023 11:38:06 +0200 Subject: [PATCH] Updates --- hypr/hyprland.conf | 4 +++- scripts/wallpaper-swww.sh | 49 +++++++++++++++++++++++++++++++++++++++ waybar/colors-waybar.css | 38 +++++++++++++++--------------- waybar/config | 2 +- waybar/style.css | 10 ++++---- 5 files changed, 78 insertions(+), 25 deletions(-) create mode 100755 scripts/wallpaper-swww.sh diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 3d3dd35..ca8774b 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -12,7 +12,8 @@ # Monitor Setup # See https://wiki.hyprland.org/Configuring/Monitors/ # ----------------------------------------------------- -monitor=,preferred,auto,1 +# monitor=,preferred,auto,1 +monitor=,1920x1080,auto,1 # ----------------------------------------------------- # Autostart @@ -136,6 +137,7 @@ bind = $mainMod CTRL, Q, exec, ~/dotfiles/scripts/powermenu-hypr.sh bind = $mainMod, E, exec, dolphin bind = $mainMod, T, togglefloating bind = $mainMod SHIFT, W, exec, ~/dotfiles/scripts/updatewal-swww.sh +bind = $mainMod CTRL, W, exec, ~/dotfiles/scripts/wallpaper-swww.sh bind = $mainMod, B, exec, brave bind = $mainMod CTRL, RETURN, exec, ~/dotfiles/scripts/applauncher.sh bind = $mainMod, P, pseudo # dwindle diff --git a/scripts/wallpaper-swww.sh b/scripts/wallpaper-swww.sh new file mode 100755 index 0000000..d929ec1 --- /dev/null +++ b/scripts/wallpaper-swww.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# __ __ _ _ +# \ \ / /_ _| | |_ __ __ _ _ __ ___ _ __ +# \ \ /\ / / _` | | | '_ \ / _` | '_ \ / _ \ '__| +# \ V V / (_| | | | |_) | (_| | |_) | __/ | +# \_/\_/ \__,_|_|_| .__/ \__,_| .__/ \___|_| +# |_| |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- + +# ----------------------------------------------------- +# Select wallpaper +# ----------------------------------------------------- +selected=$(ls -1 ~/wallpaper | grep "jpg" | rofi -dmenu -p "Wallpapers") + +if [ "$selected" ]; then + + echo "Changing theme..." + # ----------------------------------------------------- + # Update wallpaper with pywal + # ----------------------------------------------------- + wal -q -i ~/wallpaper/$selected + + # ----------------------------------------------------- + # Get new theme + # ----------------------------------------------------- + source "$HOME/.cache/wal/colors.sh" + + # ----------------------------------------------------- + # Copy color file to waybar folder + # ----------------------------------------------------- + cp ~/.cache/wal/colors-waybar.css ~/dotfiles/waybar/ + + newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g") + + # ----------------------------------------------------- + # Set the new wallpaper + # ----------------------------------------------------- + swww img $wallpaper --transition-step 20 --transition-fps=20 + ~/dotfiles/waybar/reload.sh + + # ----------------------------------------------------- + # Send notification + # ----------------------------------------------------- + notify-send "Theme and Wallpaper updated" "With image $newwall" + + echo "Done." +fi diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css index 67d7b72..6fb0408 100644 --- a/waybar/colors-waybar.css +++ b/waybar/colors-waybar.css @@ -1,20 +1,20 @@ -@define-color foreground #bfc2c2; -@define-color background #000b0d; -@define-color cursor #bfc2c2; +@define-color foreground #bfc0c0; +@define-color background #020406; +@define-color cursor #bfc0c0; -@define-color color0 #000b0d; -@define-color color1 #21ACC5; -@define-color color2 #63B7C6; -@define-color color3 #7AC2CD; -@define-color color4 #8BBAC9; -@define-color color5 #90C8D1; -@define-color color6 #AED3D8; -@define-color color7 #bfc2c2; -@define-color color8 #3f4849; -@define-color color9 #21ACC5; -@define-color color10 #63B7C6; -@define-color color11 #7AC2CD; -@define-color color12 #8BBAC9; -@define-color color13 #90C8D1; -@define-color color14 #AED3D8; -@define-color color15 #bfc2c2; +@define-color color0 #020406; +@define-color color1 #284F76; +@define-color color2 #525F61; +@define-color color3 #8A796B; +@define-color color4 #305988; +@define-color color5 #196497; +@define-color color6 #2961AB; +@define-color color7 #bfc0c0; +@define-color color8 #414244; +@define-color color9 #284F76; +@define-color color10 #525F61; +@define-color color11 #8A796B; +@define-color color12 #305988; +@define-color color13 #196497; +@define-color color14 #2961AB; +@define-color color15 #bfc0c0; diff --git a/waybar/config b/waybar/config index 894f6f9..c9a0461 100644 --- a/waybar/config +++ b/waybar/config @@ -136,7 +136,7 @@ "tooltip": false }, "memory": { - "format": " {}%" + "format": " {}%" }, "temperature": { // "thermal-zone": 2, diff --git a/waybar/style.css b/waybar/style.css index 08881c3..d6cc52b 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -30,6 +30,7 @@ button { color: #FFFFFF; /* font-weight:bold; */ border:0; + margin:0; } #workspaces button.active { @@ -79,7 +80,7 @@ button { margin: 6px 10px 6px 0px; padding: 0 0px; color: #ffffff; - font-size:14; + font-size:16; } #window, @@ -87,6 +88,7 @@ button { margin: 5 10px 5 10px; background-color:@color11; opacity:0.8; + padding:0; } .modules-left > widget:first-child > #workspaces { @@ -99,7 +101,7 @@ button { #custom-appmenu { margin-left:16; - font-size:18; + font-size:16; font-weight:bold; } @@ -110,12 +112,12 @@ button { #custom-exit { margin-right: 10px; - font-size:16px; + font-size:14px; } #clock { background-color: transparent; - font-size:18; + font-size:16; } #battery {