diff --git a/1-install.sh b/1-install.sh index b71ddfb..569ac50 100755 --- a/1-install.sh +++ b/1-install.sh @@ -68,7 +68,7 @@ echo "-> Install main packages" packagesPacman=("picom" "alacritty" "rofi" "rofi-calc" "chromium" "scrot" "nitrogen" "dunst" "starship" "slock" "neovim" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "breeze" "breeze-gtk" "vlc" "exa" "python-pip" "python-psutil" "python-rich" "python-click" "xdg-desktop-portal-gtk" "pavucontrol" "tumbler" "xautolock"); -packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme"); +packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme" "trizen"); # ------------------------------------------------------ # Install required packages diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index c2116b6..f0242bf 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -126,7 +126,7 @@ device:epic-mouse-v1 { # Window rules # ----------------------------------------------------- windowrule = tile,^(Brave-browser)$ -windowrule = tile,^(chromium)$ +windowrule = tile,^(Chromium)$ # ----------------------------------------------------- # Key bindings diff --git a/scripts/updates.sh b/scripts/updates.sh new file mode 100755 index 0000000..30e73ae --- /dev/null +++ b/scripts/updates.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# _ _ _ _ +# | | | |_ __ __| | __ _| |_ ___ ___ +# | | | | '_ \ / _` |/ _` | __/ _ \/ __| +# | |_| | |_) | (_| | (_| | || __/\__ \ +# \___/| .__/ \__,_|\__,_|\__\___||___/ +# |_| +# +# by Stephan Raabe (2023) +# ----------------------------------------------------- + +if ! updates_arch=$(checkupdates 2> /dev/null | wc -l ); then + updates_arch=0 +fi + +if ! updates_aur=$(trizen -Su --aur --quiet | wc -l); then + updates_aur=0 +fi + +updates=$(("$updates_arch" + "$updates_aur")) + +if [ "$updates" -gt 0 ]; then + echo " $updates" +else + echo "0" +fi diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css index 42a93d1..c24bbca 100644 --- a/waybar/colors-waybar.css +++ b/waybar/colors-waybar.css @@ -1,20 +1,20 @@ -@define-color foreground #bfc0c0; -@define-color background #020305; -@define-color cursor #bfc0c0; +@define-color foreground #c2c3c4; +@define-color background #0d0f16; +@define-color cursor #c2c3c4; -@define-color color0 #020305; -@define-color color1 #0F325B; -@define-color color2 #5A2E4A; -@define-color color3 #084B6F; -@define-color color4 #6B5156; -@define-color color5 #A13E45; -@define-color color6 #0B658F; -@define-color color7 #bfc0c0; -@define-color color8 #414243; -@define-color color9 #0F325B; -@define-color color10 #5A2E4A; -@define-color color11 #084B6F; -@define-color color12 #6B5156; -@define-color color13 #A13E45; -@define-color color14 #0B658F; -@define-color color15 #bfc0c0; +@define-color color0 #0d0f16; +@define-color color1 #9B94B2; +@define-color color2 #D1949D; +@define-color color3 #99A3CF; +@define-color color4 #ADB2D5; +@define-color color5 #C7B9D1; +@define-color color6 #B2C2DE; +@define-color color7 #c2c3c4; +@define-color color8 #494b50; +@define-color color9 #9B94B2; +@define-color color10 #D1949D; +@define-color color11 #99A3CF; +@define-color color12 #ADB2D5; +@define-color color13 #C7B9D1; +@define-color color14 #B2C2DE; +@define-color color15 #c2c3c4; diff --git a/waybar/config b/waybar/config index 9bb5b1a..4d033a1 100644 --- a/waybar/config +++ b/waybar/config @@ -27,6 +27,7 @@ "wlr/workspaces" ], "modules-right": [ + "custom/updates", "pulseaudio", "group/hardware", "battery", diff --git a/waybar/modules.json b/waybar/modules.json index 8bbfcc2..1625c36 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -51,6 +51,15 @@ "tooltip": false }, + // Updates Count + "custom/updates": { + "format": " {}", + "exec": "~/dotfiles/scripts/updates.sh", + "restart-interval": 60, + "on-click": "alacritty -e yay", + "tooltip": false + }, + // Outlook Launcher "custom/outlook": { "format": "", @@ -133,12 +142,12 @@ // CPU "cpu": { - "format": "/ {usage}% ", + "format": "/ C {usage}% ", }, // Memory "memory": { - "format": "/ {}% " + "format": "/ M {}% " }, // Harddisc space used diff --git a/waybar/myconfig b/waybar/myconfig index e12de8e..81cafee 100644 --- a/waybar/myconfig +++ b/waybar/myconfig @@ -29,6 +29,7 @@ ], "modules-right": [ "custom/youtube", + "custom/updates", "pulseaudio", "group/hardware", "battery", diff --git a/waybar/style.css b/waybar/style.css index 484512f..962ff31 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -153,7 +153,7 @@ tooltip label { opacity:0.8; } -#custom-youtube, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass { +#custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass { margin-right:15px; font-size:16px; } @@ -163,6 +163,26 @@ tooltip label { font-size:20px; } +#custom-updates { + background-color: #FFFFFF; + font-size: 16px; + color: @background; + border-radius: 12px; + padding: 2px 10px 0px 10px; + margin: 5px 15px 5px 0px; + opacity:0.8; +} + +#custom-youtube { + background-color: #FFFFFF; + font-size: 16px; + color: @background; + border-radius: 12px; + padding: 2px 10px 0px 10px; + margin: 5px 15px 5px 0px; + opacity:0.8; +} + /* ----------------------------------------------------- * Hardware Group * ----------------------------------------------------- */ @@ -192,9 +212,13 @@ tooltip label { * ----------------------------------------------------- */ #pulseaudio { - font-size:16px; - margin-right:15px; - + background-color: #FFFFFF; + font-size: 16px; + color: @background; + border-radius: 12px; + padding: 2px 10px 0px 10px; + margin: 5px 15px 5px 0px; + opacity:0.8; } #pulseaudio.muted {