diff --git a/.install/hidpi.sh b/.install/hidpi.sh index b7638ec..8aa5546 100755 --- a/.install/hidpi.sh +++ b/.install/hidpi.sh @@ -11,7 +11,7 @@ hidpiconfirm="Do you want 2x hidpi scale?" if gum confirm "$hidpiconfirm"; then sed -i -E 's/size = [0-9]+(\.[0-9]+)?/size = 16/' ~/dotfiles-versions/$version/alacritty/alacritty.toml sed -i -E 's/[0-9]+(\.[0-9]+)?/16/' ~/dotfiles-versions/$version/.settings/rofi-font.rasi - echo -e '\n# hidpi scale\nsource = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/conf/custom.conf + echo -e '\n\n# hidpi scale\nsource = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/conf/custom.conf sed -i -E 's/1/2/' ~/dotfiles-versions/$version/hypr/conf/monitors/default.conf echo ":: finished hidpi patch." fi diff --git a/.install/hyprland-dotfiles.sh b/.install/hyprland-dotfiles.sh index 022afc4..551d6a8 100644 --- a/.install/hyprland-dotfiles.sh +++ b/.install/hyprland-dotfiles.sh @@ -5,6 +5,9 @@ if [ -d ~/dotfiles-versions/$version/alacritty ]; then _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config fi +if [ -d ~/dotfiles-versions/$version/kitty ]; then + _installSymLink kitty ~/.config/kitty ~/dotfiles/kitty/ ~/.config +fi if [ -d ~/dotfiles-versions/$version/vim ]; then _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config fi @@ -43,5 +46,8 @@ fi if [ -d ~/dotfiles-versions/$version/fastfetch ]; then _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config fi +if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then + _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config +fi echo ":: Symbolic links created." echo diff --git a/.install/packages/general-packages.sh b/.install/packages/general-packages.sh index 189a9c0..badf97e 100644 --- a/.install/packages/general-packages.sh +++ b/.install/packages/general-packages.sh @@ -22,7 +22,8 @@ packagesPacman=( "noto-fonts" "otf-font-awesome" "ttf-fira-sans" - "ttf-fira-code" + "ttf-fira-code" + "ttf-firacode-nerd" "ttf-firacode-nerd" "figlet" "vlc" @@ -62,8 +63,7 @@ packagesPacman=( ); packagesYay=( - "pfetch" - "bibata-cursor-theme" + "vimix-cursors" "trizen" "pacseek" ); diff --git a/.install/packages/hyprland-packages.sh b/.install/packages/hyprland-packages.sh index 35c57dc..5ca80b0 100644 --- a/.install/packages/hyprland-packages.sh +++ b/.install/packages/hyprland-packages.sh @@ -9,9 +9,11 @@ packagesPacman=( "cliphist" "hyprlock" "hypridle" + "kitty" ); packagesYay=( + "pyprland" "swww" "wlogout" "nwg-look" diff --git a/.install/wallpaper.sh b/.install/wallpaper.sh index ecd8dc2..aefe1c2 100644 --- a/.install/wallpaper.sh +++ b/.install/wallpaper.sh @@ -5,16 +5,17 @@ echo -e "${GREEN}" figlet "Wallpapers" echo -e "${NONE}" if [ ! -d ~/wallpaper ]; then - echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?" + echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?" echo "If not, the script will install 3 default wallpapers in ~/wallpaper/" echo "" if gum confirm "Do you want to download the repository?" ;then - wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip - unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/ - if [ ! -d ~/wallpaper/ ]; then - mkdir ~/wallpaper - fi - cp ~/Downloads/wallpaper-main/* ~/wallpaper/ + # wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip + # unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/ + # if [ ! -d ~/wallpaper/ ]; then + # mkdir ~/wallpaper + # fi + # cp ~/Downloads/wallpaper-main/* ~/wallpaper/ + git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/wallpaper echo "Wallpapers from the repository installed successfully." elif [ $? -eq 130 ]; then exit 130 diff --git a/.zshrc b/.zshrc new file mode 100644 index 0000000..bb724dc --- /dev/null +++ b/.zshrc @@ -0,0 +1,128 @@ +# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. +# Initialization code that may require console input (password prompts, [y/n] +# confirmations, etc.) must go above this block; everything else may go below. +if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then + source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" +fi + +# If you come from bash you might have to change your $PATH. +export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH + +# Path to your oh-my-zsh installation. +export ZSH="$HOME/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +# ZSH_THEME="robbyrussell" +ZSH_THEME="powerlevel10k/powerlevel10k" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu" +alias wakemac="wakeonlan 18:C0:4D:8D:56:0E" +alias ls="eza --icons=auto" +alias githashselector="git log --oneline | gum filter | cut -d' ' -f1" +alias bat="bat --paging=never" + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + +eval $(thefuck --alias) +eval "$(fzf --zsh)" + +# ----------------------------------------------------- +# PYWAL +# ----------------------------------------------------- +cat ~/.cache/wal/sequences + +export EDITOR=nvim diff --git a/chrome-flags.conf b/chrome-flags.conf new file mode 100644 index 0000000..a6c93f9 --- /dev/null +++ b/chrome-flags.conf @@ -0,0 +1 @@ +--ozone-platform=wayland --enable-wayland-ime diff --git a/fastfetch/config.jsonc b/fastfetch/config.jsonc index 501fe00..38a82cf 100644 --- a/fastfetch/config.jsonc +++ b/fastfetch/config.jsonc @@ -155,10 +155,10 @@ "compact": true, "keyColor": "blue" }, + "break", { - "type": "colors", - "paddingLeft": 4, - "symbol": "circle" + "type": "custom", + "format": " \u001b[90m󱓻 \u001b[31m󱓻 \u001b[32m󱓻 \u001b[33m󱓻 \u001b[34m󱓻 \u001b[35m󱓻 \u001b[36m󱓻 \u001b[37m󱓻 \u001b[38m󱓻 \u001b[39m󱓻" } ] } diff --git a/hypr/conf/animation.conf b/hypr/conf/animation.conf index 68c1127..3259ada 100644 --- a/hypr/conf/animation.conf +++ b/hypr/conf/animation.conf @@ -1 +1 @@ -source = ~/dotfiles/hypr/conf/animations/animation-moving.conf +source = ~/dotfiles/hypr/conf/animations/animations-high.conf diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf index 5acb6f8..fd3cf8e 100644 --- a/hypr/conf/autostart.conf +++ b/hypr/conf/autostart.conf @@ -31,4 +31,6 @@ exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh exec-once = ~/.config/ml4w-hyprland-settings/hyprctl.sh # Start ewww daemon -exec-once = ~/dotfiles/hypr/scripts/eww.sh \ No newline at end of file +exec-once = ~/dotfiles/hypr/scripts/eww.sh + +exec-once = pypr diff --git a/hypr/conf/cursor.conf b/hypr/conf/cursor.conf index b3b3493..39f83fd 100644 --- a/hypr/conf/cursor.conf +++ b/hypr/conf/cursor.conf @@ -1 +1 @@ -exec-once = hyprctl setcursor Bibata-Modern-Ice 24 +exec-once = hyprctl setcursor Vimix 24 diff --git a/hypr/conf/keybindings/custom.conf b/hypr/conf/keybindings/custom.conf index ef1b5b6..602b2f6 100644 --- a/hypr/conf/keybindings/custom.conf +++ b/hypr/conf/keybindings/custom.conf @@ -92,3 +92,6 @@ bind = $mainMod, P, submap, passthru submap = passthru bind = SUPER, Escape, submap, reset submap = reset + +# Pyprland +bind = $mainMod SHIFT, RETURN, exec, pypr toggle term diff --git a/hypr/conf/keyboard.conf b/hypr/conf/keyboard.conf index 9a9b55d..af4fb36 100644 --- a/hypr/conf/keyboard.conf +++ b/hypr/conf/keyboard.conf @@ -3,15 +3,17 @@ # https://wiki.hyprland.org/Configuring/Variables/#input # ----------------------------------------------------- input { - kb_layout = de - kb_variant = + kb_layout = us + kb_variant = kb_model = kb_options = numlock_by_default = true follow_mouse = 1 mouse_refocus=false touchpad { - natural_scroll = false + natural_scroll = ture + disable_while_typing=true + tap-to-click=true } sensitivity = 0 # -1.0 - 1.0, 0 means no modification. } diff --git a/hypr/conf/layout.conf b/hypr/conf/layout.conf index dc78a62..3692c19 100644 --- a/hypr/conf/layout.conf +++ b/hypr/conf/layout.conf @@ -12,5 +12,13 @@ master { } gestures { - workspace_swipe = false + workspace_swipe=true + workspace_swipe_fingers=3 + workspace_swipe_distance=400 + workspace_swipe_invert=true + workspace_swipe_min_speed_to_force=30 + workspace_swipe_cancel_ratio=0.5 + workspace_swipe_create_new=true + workspace_swipe_forever=true } + diff --git a/hypr/conf/monitors/dual.conf b/hypr/conf/monitors/dual.conf index 23591a5..de69d67 100644 --- a/hypr/conf/monitors/dual.conf +++ b/hypr/conf/monitors/dual.conf @@ -4,4 +4,7 @@ # ----------------------------------------------------- monitor=DP-1,preferred,0x0,2 -monitor=HDMI-A-1,3840x2160,1920x-180,2,transform,1 +monitor=HDMI-A-1,3840x2160,1920x-275,2,transform,1 + +workspace=1,monitor:DP-1 +exec-once=hyprctl dispatch workspace 1 diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml new file mode 100644 index 0000000..2ab74e8 --- /dev/null +++ b/hypr/pyprland.toml @@ -0,0 +1,12 @@ +[pyprland] + +plugins = [ + "scratchpads", + "magnify", +] + +[scratchpads.term] +animation = "fromTop" +command = "kitty --class kitty-dropterm" +class = "kitty-dropterm" +size = "75% 60%" diff --git a/kitty/kitty.conf b/kitty/kitty.conf new file mode 100644 index 0000000..595bc91 --- /dev/null +++ b/kitty/kitty.conf @@ -0,0 +1,14 @@ +font_family Fira Code Nerd Font +font_size 14.0 +bold_font auto +italic_font auto +bold_italic_font auto + +background_opacity 0.7 + +confirm_os_window_close 0 + +enable_audio_bell no + +selection_foreground #000000 +selection_background #F5FBFF diff --git a/waybar/modules.json b/waybar/modules.json index 88c31d0..8305268 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -33,7 +33,8 @@ "on-click": "activate", "on-click-middle": "close", "ignore-list": [ - "Alacritty" + "Alacritty", + "alacritty-dropterm" ], "app_ids-mapping": { "firefoxdeveloperedition": "firefox-developer-edition" diff --git a/waybar/themes/custom/colored/style.css b/waybar/themes/custom/colored/style.css index f440400..172a833 100644 --- a/waybar/themes/custom/colored/style.css +++ b/waybar/themes/custom/colored/style.css @@ -13,4 +13,35 @@ @define-color textcolor3 #FFFFFF; @define-color iconcolor #FFFFFF; + @define-color base #1e1e2e; + @define-color mantle #181825; + @define-color crust #11111b; + + @define-color text #cdd6f4; + @define-color subtext0 #a6adc8; + @define-color subtext1 #bac2de; + + @define-color surface0 #313244; + @define-color surface1 #45475a; + @define-color surface2 #585b70; + + @define-color overlay0 #6c7086; + @define-color overlay1 #7f849c; + @define-color overlay2 #9399b2; + + @define-color blue #89b4fa; + @define-color lavender #b4befe; + @define-color sapphire #74c7ec; + @define-color sky #89dceb; + @define-color teal #94e2d5; + @define-color green #a6e3a1; + @define-color yellow #f9e2af; + @define-color peach #fab387; + @define-color maroon #eba0ac; + @define-color red #f38ba8; + @define-color mauve #cba6f7; + @define-color pink #f5c2e7; + @define-color flamingo #f2cdcd; + @define-color rosewater #f5e0dc; + @import '../style.css'; \ No newline at end of file diff --git a/waybar/themes/custom/config b/waybar/themes/custom/config index d4a4ae5..96579d0 100644 --- a/waybar/themes/custom/config +++ b/waybar/themes/custom/config @@ -1,73 +1,70 @@ -// __ __ _ -// \ \ / /_ _ _ _| |__ __ _ _ __ -// \ \ /\ / / _` | | | | '_ \ / _` | '__| -// \ V V / (_| | |_| | |_) | (_| | | -// \_/\_/ \__,_|\__, |_.__/ \__,_|_| -// |___/ -// -// by Stephan Raabe (2023) -// ----------------------------------------------------- -// +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT Top -Laptop ### // { - // General Settings - - // Position TOP + "include": "~/dotfiles/waybar/themes/custom/modules.json", "layer": "top", - "margin-bottom": 0, + //"mode": "dock", + "exclusive": true, + "passthrough": false, + "position": "top", + "spacing": 3, + "fixed-center": true, + "ipc": true, + "margin-top": 3, + "margin-left": 8, + "margin-right": 8, - // Position BOTTOM - // "position": "bottom", - // "margin-top": 0, - // "margin-bottom": 14, - - "layer": "top", - "margin-left": 0, - "margin-right": 0, - "spacing": 0, - - // Load Modules - "include": ["~/dotfiles/waybar/themes/custom/modules.json"], - - // Modules Left "modules-left": [ - "custom/appmenu", - "custom/settings", - "custom/waybarthemes", - "custom/wallpaper", - // START TASK TOOGLE - // "wlr/taskbar", - // END TASK TOOGLE - "group/quicklinks", - "hyprland/window", - "custom/starter" - ], + "hyprland/workspaces#pacman", + "custom/separator#dot-line", + "cpu", + "custom/separator#dot-line", + "temperature", + "custom/separator#dot-line", + "memory", + "custom/separator#dot-line", + "custom/weather", + "custom/separator#blank_3", + "custom/cava_mviz", + ], - // Modules Center "modules-center": [ - "hyprland/workspaces" - ], - - // Modules Right - "modules-right": [ - "custom/updates", - "pulseaudio", - // START BT TOOGLE - "bluetooth", - // END BT TOOGLE - "battery", - // START NETWORK TOOGLE - "network", - // END NETWORK TOOGLE - "group/hardware", - "custom/cliphist", - // START IDLE TOOGLE + "custom/menu", + "custom/separator#dot-line", "idle_inhibitor", - // END IDLE TOOGLE - // START TRAY TOOGLE + "custom/separator#dot-line", + "clock", + "custom/separator#dot-line", + "custom/light_dark", + "custom/separator#dot-line", + "custom/lock", + //], + "custom/separator#dot-line", + "custom/hint", + ], + + "modules-right": [ + "network#speed", + "custom/separator#dot-line", + "custom/swaync", "tray", - // END TRAY TOOGLE - "custom/exit", - "custom/ml4w-welcome", - "clock" - ] -} + "mpris", + "custom/separator#dot-line", + "bluetooth", + "custom/separator#dot-line", + "battery", + "custom/separator#dot-line", + "backlight", + "custom/separator#dot-line", + "pulseaudio", + "custom/separator#dot-line", + "pulseaudio#microphone", + "custom/separator#dot-line", + "keyboard-state", + "custom/separator#dot-line", + "custom/keyboard", + "custom/separator#dot-line", + "custom/power", + ], + } \ No newline at end of file diff --git a/waybar/themes/custom/modules.json b/waybar/themes/custom/modules.json index 8644a83..e99dc63 100644 --- a/waybar/themes/custom/modules.json +++ b/waybar/themes/custom/modules.json @@ -1,330 +1,708 @@ -// __ __ _ _ -// | \/ | ___ __| |_ _| | ___ ___ -// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| -// | | | | (_) | (_| | |_| | | __/\__ \ -// |_| |_|\___/ \__,_|\__,_|_|\___||___/ -// -// -// by Stephan Raabe (2023) -// ----------------------------------------------------- -// +//* ---- 💫 https://github.com/JaKooLit 💫 ---- *// +/* Waybar Modules */ + { - // Workspaces - "hyprland/workspaces" : { - "on-click": "activate", + // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs + // CIRCLES Style + "hyprland/workspaces": { "active-only": false, "all-outputs": true, - "format": "{}", - "format-icons": { - "urgent": "", - "active": "", - "default": "" - }, - "persistent-workspaces": { - "*": 5 - } - }, - - // Taskbar - "wlr/taskbar": { "format": "{icon}", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "persistent-workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + }, + "format-icons": { + "active": "", + "default": "", + }, + }, + // ROMAN Numerals style + "hyprland/workspaces#roman": { + "active-only": false, + "all-outputs": true, + "format": "{icon}", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "persistent-workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + }, + "format-icons": { + "1": "I", + "2": "II", + "3": "III", + "4": "IV", + "5": "V", + "6": "VI", + "7": "VII", + "8": "VIII", + "9": "IX", + "10": "X", + }, + }, + // PACMAN Style + "hyprland/workspaces#pacman": { + "active-only": false, + "all-outputs": true, + "format": "{icon}", + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "show-special": false, + "persistent-workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + }, + "format": "{icon}", + "format-icons": { + "active": " 󰮯 ", + "default": "󰊠", + "persistent": "󰊠", + }, + }, + "hyprland/workspaces#kanji": { + "disable-scroll": true, + "all-outputs": true, + "format": "{icon}", + "persistent-workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + }, + "format-icons": { + "1": "一", + "2": "二", + "3": "三", + "4": "四", + "5": "五", + "6": "六", + "7": "七", + "8": "八", + "9": "九", + "10": "十", + } + }, + // NUMBERS and ICONS style + "hyprland/workspaces#4": { + "format": "{name}", + "format": " {name} {icon} ", + //"format": " {icon} ", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "all-outputs": true, + "sort-by-number": true, + "format-icons": { + "1": " ", + "2": " ", + "3": " ", + "4": " ", + "5": " ", + "6": " ", + "7": "", + "8": " ", + "9": "", + "10": "10", + "focused": "", + "default": "", + }, + }, + // GROUP + "group/motherboard": { + "orientation": "horizontal", + "modules": [ + "cpu", + "memory", + "temperature", + "disk", + ] + }, + "group/laptop": { + "orientation": "horizontal", + "modules": [ + "backlight", + "battery", + ] + }, + "group/audio": { + "orientation": "horizontal", + "modules": [ + "pulseaudio", + "pulseaudio#microphone", + ] + }, + "backlight": { + "interval": 2, + "align": 0, + "rotate": 0, + //"format": "{icon} {percent}%", + "format-icons": [ + " ", + " ", + " ", + "󰃝 ", + "󰃞 ", + "󰃟 ", + "󰃠 " + ], + "format": "{icon}", + //"format-icons": ["","","","","","","","","","","","","","",""], + "tooltip-format": "backlight {percent}%", + "icon-size": 10, + "on-click": "", + "on-click-middle": "", + "on-click-right": "", + "on-update": "", + "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec", + "smooth-scrolling-threshold": 1, + }, + "battery": { + //"interval": 5, + "align": 0, + "rotate": 0, + //"bat": "BAT1", + //"adapter": "ACAD", + "full-at": 100, + "design-capacity": false, + "states": { + "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": "󱘖 {capacity}%", + "format-alt-click": "click", + "format-full": "{icon} Full", + "format-alt": "{icon} {time}", + "format-icons": [ + "󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹" + ], + "format-time": "{H}h {M}min", + "tooltip": true, + "tooltip-format": "{timeTo} {power}w", + "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh", + "on-click-right": "~/.config/hypr/scripts/Wlogout.sh", + }, + "bluetooth": { + "format": "", + "format-disabled": "󰂳", + "format-connected": "󰂱 {num_connections}", + "tooltip-format": " {device_alias}", + "tooltip-format-connected": "{device_enumerate}", + "tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%", + "tooltip": true, + "on-click": "blueman-manager", + }, + "clock": { + "interval": 1, + //"format": " {:%I:%M %p}", // AM PM format + "format": " {:%H:%M:%S}", + "format-alt": " {:%H:%M  %Y, %d %B, %A}", + "tooltip-format": "{calendar}", + "calendar": { + "mode": "year", + "mode-mon-col": 3, + "weeks-pos": "right", + "on-scroll": 1, + "format": { + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}" + } + } + }, + "actions": { + "on-click-right": "mode", + "on-click-forward": "tz_up", + "on-click-backward": "tz_down", + "on-scroll-up": "shift_up", + "on-scroll-down": "shift_down" + }, + "cpu": { + "format": "{usage}% 󰍛", + "interval": 1, + "format-alt-click": "click", + "format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛", + "format-icons": [ + "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" + ], + "on-click-right": "gnome-system-monitor", + }, + "disk": { + "interval": 30, + //"format": "󰋊", + "path": "/", + //"format-alt-click": "click", + "format": "{percentage_used}% 󰋊", + //"tooltip": true, + "tooltip-format": "{used} used out of {total} on {path} ({percentage_used}%)", + }, + "hyprland/language": { + "format": "Lang: {}", + "format-en": "US", + "format-tr": "Korea", + "keyboard-name": "at-translated-set-2-keyboard", + "on-click": "hyprctl switchxkblayout $SET_KB next" + }, + "hyprland/submap": { + "format": " {}", // Icon: expand-arrows-alt + "tooltip": false, + }, + "hyprland/window": { + "format": "{}", + "max-length": 40, + "separate-outputs": true, + "offscreen-css": true, + "offscreen-css-text": "(inactive)", + "rewrite": { + "(.*) — Mozilla Firefox": " $1", + "(.*) - fish": "> [$1]", + "(.*) - zsh": "> [$1]", + "(.*) - $term": "> [$1]", + }, + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": " ", + "deactivated": " ", + } + }, + "keyboard-state": { + //"numlock": true, + "capslock": true, + "format": { + "numlock": "N {icon}", + "capslock": "󰪛 {icon}", + }, + "format-icons": { + "locked": "", + "unlocked": "" + }, + }, + "memory": { + "interval": 10, + "format": "{used:0.1f}G 󰾆", + "format-alt": "{percentage}% 󰾆", + "format-alt-click": "click", + "tooltip": true, + "tooltip-format": "{used:0.1f}GB/{total:0.1f}G", + "on-click-right": "kitty --title btop sh -c 'btop'" + }, + "mpris": { + "interval": 10, + "format": "{player_icon} ", + "format-paused": "{status_icon} {dynamic}", + "on-click-middle": "playerctl play-pause", + "on-click": "playerctl previous", + "on-click-right": "playerctl next", + "scroll-step": 5.0, + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", + "smooth-scrolling-threshold": 1, + "player-icons": { + "chromium": "", + "default": "", + "firefox": "", + "kdeconnect": "", + "mopidy": "", + "mpv": "󰐹", + "spotify": "", + "vlc": "󰕼", + }, + "status-icons": { + "paused": "󰐎", + "playing": "", + "stopped": "", + }, + // "ignored-players": ["firefox"] + "max-length": 30, + }, + "network": { + "format": "{ifname}", + "format-wifi": "{icon}", + "format-ethernet": "󰌘", + "format-disconnected": "󰌙", + "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", + "format-linked": "󰈁 {ifname} (No IP)", + "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", + "tooltip-format-ethernet": "{ifname} 󰌘", + "tooltip-format-disconnected": "󰌙 Disconnected", + "max-length": 50, + "format-icons": [ + "󰤯", "󰤟", "󰤢", "󰤥", "󰤨" + ] + }, + "network#speed": { + "interval": 1, + "format": "{ifname}", + "format-wifi": "{icon}  {bandwidthUpBytes}  {bandwidthDownBytes}", + "format-ethernet": "󰌘  {bandwidthUpBytes}  {bandwidthDownBytes}", + "format-disconnected": "󰌙", + "tooltip-format": "{ipaddr}", + "format-linked": "󰈁 {ifname} (No IP)", + "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", + "tooltip-format-ethernet": "{ifname} 󰌘", + "tooltip-format-disconnected": "󰌙 Disconnected", + "max-length": 50, + "format-icons": [ + "󰤯", "󰤟", "󰤢", "󰤥", "󰤨" + ] + }, + "pulseaudio": { + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} 󰂰 {volume}%", + "format-muted": "󰖁", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [ + "", "", "󰕾", "" + ], + "ignored-sinks": [ + "Easy Effects Sink" + ], + }, + "scroll-step": 5.0, + "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", + "on-click-right": "pavucontrol -t 3", + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", + "tooltip-format": "{icon} {desc} | {volume}%", + "smooth-scrolling-threshold": 1, + }, + "pulseaudio#microphone": { + "format": "{format_source}", + "format-source": " {volume}%", + "format-source-muted": "", + "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic", + "on-click-right": "pavucontrol -t 4", + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec", + "tooltip-format": "{source_desc} | {source_volume}%", + "scroll-step": 5, + }, + "temperature": { + "interval": 10, + "tooltip": true, + "hwmon-path": [ + "/sys/class/hwmon/hwmon1/temp1_input", + "/sys/class/thermal/thermal_zone0/temp" + ], + //"thermal-zone": 0, + "critical-threshold": 82, + "format-critical": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C {icon}", + "format-icons": [ + "󰈸" + ], + "on-click-right": "kitty --title nvtop sh -c 'nvtop'" + }, + "tray": { "icon-size": 18, + "spacing": 4, + }, + "wireplumber": { + "format": "{icon} {volume} %", + "format-muted": " Mute", + "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", + "on-click-right": "pavucontrol -t 3", + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", + "format-icons": [ + "", "", "󰕾", "" + ], + }, + "wlr/taskbar": { + "format": "{icon} {name} ", + "icon-size": 15, + "all-outputs": false, "tooltip-format": "{title}", "on-click": "activate", "on-click-middle": "close", "ignore-list": [ - "Alacritty" - ], - "app_ids-mapping": { - "firefoxdeveloperedition": "firefox-developer-edition" - }, - "rewrite": { - "Firefox Web Browser": "Firefox", - "Foot Server": "Terminal" - } + "wofi", + "rofi", + ] }, - - // Hyprland Window - "hyprland/window": { - "rewrite": { - "(.*) - Brave": "$1", - "(.*) - Chromium": "$1", - "(.*) - Brave Search": "$1", - "(.*) - Outlook": "$1", - "(.*) Microsoft Teams": "$1" - }, - "separate-outputs": true + "custom/cycle_wall": { + "format": " ", + "exec": "echo ; echo 󰸉 wallpaper select", + "on-click": "~/.config/hypr/UserScripts/WallpaperSelect.sh", + "on-click-right": "~/.config/hypr/UserScripts/WallpaperRandom.sh", + "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh", + "interval": 86400, // once every day + "tooltip": true, }, - - // Cliphist - "custom/cliphist": { - "format": "", - "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh", - "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d", - "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w", - "tooltip": false + "custom/hint": { + "format": "󰺁 HINT!", + "exec": "echo ; echo  Key Hints SUPER H", + "on-click": "~/.config/hypr/scripts/KeyHints.sh", + "interval": 86400, // once every day + "tooltip": true, }, - - // Updates Count - "custom/updates": { - "format": " {}", - "tooltip-format": "{}", - "escape": true, - "return-type": "json", - "exec": "~/dotfiles/scripts/updates.sh", - "restart-interval": 60, - "on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh", - "tooltip": false + "custom/keyboard": { + "exec": "cat ~/.cache/kb_layout", + "interval": 1, + "format": " {}", + "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", }, - - // Theme Starter Label - "custom/starter": { - "format": "THEME STARTER", - "tooltip": false + "custom/light_dark": { + "format": "󰔎{}", + "exec": "echo ; echo 󰔎 Dark-Light switcher", + "on-click": "~/.config/hypr/scripts/DarkLight.sh", + "on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh", + "on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh", + "interval": 86400, // once every day + "tooltip": true }, - - // Wallpaper - "custom/wallpaper": { - "format": "", - "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select", - "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh", - "tooltip": false + "custom/lock": { + "format": "󰌾{}", + "exec": "echo ; echo 󰷛 screen lock", + "interval": 86400, // once every day + "tooltip": true, + "on-click": "~/.config/hypr/scripts/LockScreen.sh", }, - - // Waybar Themes - "custom/waybarthemes": { - "format": "", - "on-click": "~/dotfiles/waybar/themeswitcher.sh", - "tooltip": false + "custom/menu": { + "format": "{}", + "exec": "echo ; echo 󱓟 app launcher", + "interval": 86400, // once every day + "tooltip": true, + "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window", + "on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh", + "on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh", }, - - // Settings - "custom/settings": { - "format": "", - "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh", - "tooltip": false + // This is a custom cava visualizer + "custom/cava_mviz": { + "exec": "~/.config/hypr/scripts/WaybarCava.sh", + "format": "{}" }, - - // Keybindings - "custom/keybindings": { - "format": "", - "on-click": "~/dotfiles/hypr/scripts/keybindings.sh", - "tooltip": false + "custom/playerctl": { + "format": "{}", + "return-type": "json", + "max-length": 35, + "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", + "on-click-middle": "playerctl play-pause", + "on-click": "playerctl previous", + "on-click-right": "playerctl next", + "scroll-step": 5.0, + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", + "smooth-scrolling-threshold": 1, }, - - // Filemanager Launcher - "custom/filemanager": { - "format": "", - "on-click": "thunar", - "tooltip": false + "custom/power": { + "format": "⏻ ", + "exec": "echo ; echo 󰟡 power // blur", + "on-click": "~/.config/hypr/scripts/Wlogout.sh", + "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh", + "interval": 86400, // once every day + "tooltip": true, }, - - // Browser Launcher - "custom/browser": { - "format": "", - "on-click": "~/dotfiles/.settings/browser.sh", - "tooltip": false - }, - - // ML4W Welcome App - "custom/ml4w-welcome": { - "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage", - "format": " ", - "tooltip": false - }, - - // ChatGPT Launcher - "custom/chatgpt": { - "format": "", - "on-click": "chromium --app=https://chat.openai.com", - "tooltip": false - }, - - // Rofi Application Launcher - "custom/appmenu": { - "format": "Apps", - "on-click": "rofi -show drun -replace", - "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh", - "tooltip": false - }, - - // Power Menu - "custom/exit": { - "format": "", - "on-click": "wlogout", - "tooltip": false - }, - - // Keyboard State - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", + "custom/swaync": { + "tooltip": true, + "format": "{icon} {}", "format-icons": { - "locked": "", - "unlocked": "" - } + "notification": "", + "none": "", + "dnd-notification": "", + "dnd-none": "", + "inhibited-notification": "", + "inhibited-none": "", + "dnd-inhibited-notification": "", + "dnd-inhibited-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "sleep 0.1 && swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true, }, - - // System tray - "tray": { - // "icon-size": 21, - "spacing": 10 + // NOTE:! This is only for Arch and Arch Based Distros depend: pacman-contrib + "custom/updater": { + "format": " {}", + "exec": "checkupdates | wc -l", + "exec-if": "[[ $(checkupdates | wc -l) ]]", + "interval": 15, + "on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'", }, - - // Clock - "clock": { - // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" + "custom/weather": { + "format": "{}", + "format-alt": "{alt}: {}", + "format-alt-click": "click", + "interval": 3600, + "return-type": "json", + "exec": "~/.config/hypr/UserScripts/Weather.sh", + //"exec": "~/.config/hypr/UserScripts/Weather.py", + "exec-if": "ping wttr.in -c1", + "tooltip": true, }, - - // System - "custom/system": { - "format": "", + // Separators + "custom/separator#dot": { + "format": "", + "interval": "once", "tooltip": false }, - - // CPU - "cpu": { - "format": "/ C {usage}% ", - "on-click": "alacritty -e htop" + "custom/separator#dot-line": { + "format": "", + "interval": "once", + "tooltip": false }, - - // Memory - "memory": { - "format": "/ M {}% ", - "on-click": "alacritty -e htop" + "custom/separator#line": { + "format": "|", + "interval": "once", + "tooltip": false }, - - // Harddisc space used - "disk": { - "interval": 30, - "format": "D {percentage_used}% ", - "path": "/", - "on-click": "alacritty -e htop" - }, - - "hyprland/language": { - "format": "/ K {short}" + "custom/separator#blank": { + "format": "", + "interval": "once", + "tooltip": false }, - - // Group Hardware - "group/hardware": { - "orientation": "inherit", - "drawer": { - "transition-duration": 300, - "children-class": "not-memory", - "transition-left-to-right": false - }, - "modules": [ - "custom/system", - "disk", - "cpu", - "memory", - "hyprland/language" - ] + "custom/separator#blank_2": { + "format": " ", + "interval": "once", + "tooltip": false }, - - // Group Settings - "group/settings": { - "orientation": "inherit", - "drawer": { - "transition-duration": 300, - "children-class": "not-memory", - "transition-left-to-right": false - }, - "modules": [ - "custom/settings", - "custom/waybarthemes", - "custom/wallpaper" - ] + "custom/separator#blank_3": { + "format": " ", + "interval": "once", + "tooltip": false }, - - // Group Quicklinks - "group/quicklinks": { - "orientation": "horizontal", - "modules": [ - "custom/filemanager", - "custom/browser" - ] + // Modules below are for vertical layout + "backlight#vertical": { + "interval": 2, + "align": 0.35, + "rotate": 1, + "format": "{icon}", + //"format-icons": ["󰃞", "󰃟", "󰃠"], + "format-icons": [ + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" + ], + "on-click": "", + "on-click-middle": "", + "on-click-right": "", + "on-update": "", + "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec", + "smooth-scrolling-threshold": 1, + "tooltip-format": "{percent}%", }, - - // Network - "network": { - "format": "{ifname}", - "format-wifi": " {signalStrength}%", - "format-ethernet": " {ipaddr}", - "format-disconnected": "Not connected", //An empty format will hide the module. - "tooltip-format": " {ifname} via {gwaddri}", - "tooltip-format-wifi": " {essid} ({signalStrength}%)", - "tooltip-format-ethernet": " {ifname} ({ipaddr}/{cidr})", - "tooltip-format-disconnected": "Disconnected", - "max-length": 50, - "on-click": "alacritty -e nmtui" + "clock#vertical": { + "format": "\n{:%H\n%M\n%S\n\n \n%d\n%m\n%y}", + "interval": 1, + //"format": "\n{:%I\n%M\n%p\n\n \n%d\n%m\n%y}", + "tooltip": true, + "tooltip-format": "{calendar}", + "calendar": { + "mode": "year", + "mode-mon-col": 3, + "format": { + "today": "{}", + } + } }, - - // Battery - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", - "format-alt": "{icon} {time}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": [" ", " ", " ", " ", " "] + "cpu#vertical": { + "format": "󰍛\n{usage}%", + "interval": 1, + "on-click-right": "gnome-system-monitor", }, - - // Pulseaudio - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{icon} {volume}%", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", + "memory#vertical": { + "interval": 10, + "format": "󰾆\n{percentage}%", + "format-alt": "󰾆\n{used:0.1f}G", + "format-alt-click": "click", + "tooltip": true, + "tooltip-format": "{used:0.1f}GB/{total:0.1f}G", + "on-click-right": "kitty --title btop sh -c 'btop'", + }, + "pulseaudio#vertical": { + "format": "{icon}", + "format-bluetooth": "󰂰", + "format-muted": "󰖁", "format-icons": { "headphone": "", - "hands-free": "", - "headset": "", + "hands-free": "", + "headset": "", "phone": "", "portable": "", "car": "", - "default": ["", " ", " "] + "default": [ + "", "", "󰕾", "" + ], + "tooltip-format": "{icon} {desc} | {volume}%", + "ignored-sinks": [ + "Easy Effects Sink" + ], }, - "on-click": "pavucontrol" + "scroll-step": 5.0, + "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", + "on-click-right": "pavucontrol -t 3", + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", + "tooltip-format": "{icon} {desc} | {volume}%", + "smooth-scrolling-threshold": 1, }, - - // Bluetooth - "bluetooth": { - "format-disabled": "", - "format-off": "", - "interval": 30, - "on-click": "blueman-manager", - "format-no-controller": "" - }, - - // Other - "user": { - "format": "{user}", - "interval": 60, - "icon": false, - }, - - // Idle Inhibator - "idle_inhibitor": { - "format": "{icon}", + "pulseaudio#microphone_vertical": { + "format": "{format_source}", + "format-source": "󰍬", + "format-source-muted": "󰍭", + "on-click-right": "pavucontrol", + "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic", + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec", + "max-volume": 100, "tooltip": true, - "format-icons":{ - "activated": "", - "deactivated": "" - }, - "on-click-right": "hyprlock" - } -} + "tooltip-format": "{source_desc} | {source_volume}%", + }, + "temperature#vertical": { + "interval": 10, + "tooltip": true, + "hwmon-path": [ + "/sys/class/hwmon/hwmon1/temp1_input", + "/sys/class/thermal/thermal_zone0/temp" + ], + //"thermal-zone": 0, + "critical-threshold": 80, + "format-critical": "{icon}\n{temperatureC}°C", + "format": " {icon}", + "format-icons": [ + "󰈸" + ], + "on-click-right": "kitty --title nvtop sh -c 'nvtop'" + }, + "custom/power_vertical": { + "format": "⏻", + "exec": "echo ; echo 󰟡 power // blur", + "on-click": "~/.config/hypr/scripts/Wlogout.sh", + "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh", + "interval": 86400, // once every day + "tooltip": true, + }, +} \ No newline at end of file diff --git a/waybar/themes/custom/style.css b/waybar/themes/custom/style.css index fd877a2..8f783eb 100644 --- a/waybar/themes/custom/style.css +++ b/waybar/themes/custom/style.css @@ -1,430 +1,314 @@ -/* - * __ __ _ ____ _ _ - * \ \ / /_ _ _ _| |__ __ _ _ __ / ___|| |_ _ _| | ___ - * \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ - * \ V V / (_| | |_| | |_) | (_| | | ___) | |_| |_| | | __/ - * \_/\_/ \__,_|\__, |_.__/ \__,_|_| |____/ \__|\__, |_|\___| - * |___/ |___/ - * - * by Stephan Raabe (2023) - * ----------------------------------------------------- -*/ - -/* ----------------------------------------------------- - * Import Pywal colors - * ----------------------------------------------------- */ -/* @import 'style-light.css'; */ -/* @define-color backgroundlight #FFFFFF; -@define-color backgrounddark #FFFFFF; -@define-color workspacesbackground1 #FFFFFF; -@define-color workspacesbackground2 #CCCCCC; -@define-color bordercolor #FFFFFF; -@define-color textcolor1 #000000; -@define-color textcolor2 #000000; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; */ - -/* ----------------------------------------------------- - * General - * ----------------------------------------------------- */ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +/* Catppuccin Mocha */ * { - font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; - border: none; - border-radius: 0px; -} - -window#waybar { - background-color: rgba(0,0,0,0.2); - border-bottom: 0px solid #ffffff; - /* color: #FFFFFF; */ - transition-property: background-color; - transition-duration: .5s; -} - -/* ----------------------------------------------------- - * Workspaces - * ----------------------------------------------------- */ - -#workspaces { - margin: 5px 1px 6px 1px; - padding: 0px 1px; - border-radius: 15px; - border: 0px; + font-family: "JetBrainsMono Nerd Font"; font-weight: bold; - font-style: normal; - font-size: 16px; - color: @textcolor1; -} - -#workspaces button { - padding: 0px 5px; - margin: 4px 3px; - border-radius: 15px; - border: 0px; - color: @textcolor3; - transition: all 0.3s ease-in-out; -} - -#workspaces button.active { - color: @textcolor1; - background: @workspacesbackground2; - border-radius: 15px; - min-width: 40px; - transition: all 0.3s ease-in-out; -} - -#workspaces button:hover { - color: @textcolor1; - background: @workspacesbackground2; - border-radius: 15px; -} - -/* ----------------------------------------------------- - * Tooltips - * ----------------------------------------------------- */ - -tooltip { - border-radius: 10px; - background-color: @backgroundlight; - opacity:0.8; - padding:20px; - margin:0px; -} - -tooltip label { - color: @textcolor2; -} - -/* ----------------------------------------------------- - * Window - * ----------------------------------------------------- */ - -#window { - background: @backgroundlight; - margin: 10px 15px 10px 0px; - padding: 2px 10px 0px 10px; - border-radius: 12px; - color:@textcolor2; - font-size:16px; - font-weight:normal; -} - -window#waybar.empty #window { - background-color:transparent; -} - -/* ----------------------------------------------------- - * Taskbar - * ----------------------------------------------------- */ - -#taskbar { - background: @backgroundlight; - margin: 6px 15px 6px 0px; - padding:0px; - border-radius: 15px; - font-weight: normal; - font-style: normal; - border: 3px solid @backgroundlight; -} - -#taskbar button { - margin:0; - border-radius: 15px; - padding: 0px 5px 0px 5px; -} - -/* ----------------------------------------------------- - * Modules - * ----------------------------------------------------- */ - -.modules-left > widget:first-child > #workspaces { - margin-left: 0; -} - -.modules-right > widget:last-child > #workspaces { - margin-right: 0; -} - -/* ----------------------------------------------------- - * Custom Quicklinks - * ----------------------------------------------------- */ - -#custom-brave, -#custom-browser, -#custom-keybindings, -#custom-outlook, -#custom-filemanager, -#custom-teams, -#custom-chatgpt, -#custom-calculator, -#custom-windowsvm, -#custom-cliphist, -#custom-wallpaper, -#custom-settings, -#custom-wallpaper, -#custom-system, -#custom-waybarthemes { - margin-right: 23px; - font-size: 20px; - font-weight: bold; - color: @iconcolor; -} - - #custom-waybarthemes,#custom-system { - margin-right:15px; - } - - - #custom-ml4w-welcome { - margin-right: 15px; - background-image: url("../assets/ml4w-icon.png"); - background-repeat: no-repeat; - background-position: center; - padding-right: 24px; -} - -/* ----------------------------------------------------- - * Idle Inhibator - * ----------------------------------------------------- */ - - #idle_inhibitor { - margin-right: 15px; - font-size: 22px; - font-weight: bold; - opacity: 0.8; - color: @iconcolor; -} - -#idle_inhibitor.activated { - margin-right: 15px; - font-size: 20px; - font-weight: bold; - opacity: 0.8; - color: #dc2f2f; -} - -/* ----------------------------------------------------- - * Custom Modules - * ----------------------------------------------------- */ - -#custom-appmenu { - background-color: @backgrounddark; - font-size: 16px; - color: @textcolor1; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 10px 15px 10px 10px; -} - -/* ----------------------------------------------------- - * Custom Exit - * ----------------------------------------------------- */ - -#custom-exit { - margin: 0px 20px 0px 0px; - padding:0px; - font-size:20px; - color: @iconcolor; -} - -/* ----------------------------------------------------- - * Custom Updates - * ----------------------------------------------------- */ - -#custom-updates { - background-color: @backgroundlight; - font-size: 16px; - color: @textcolor2; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 10px 15px 10px 0px; -} - -#custom-updates.green { - background-color: @backgroundlight; -} - -#custom-updates.yellow { - background-color: #ff9a3c; - color: #FFFFFF; -} - -#custom-updates.red { - background-color: #dc2f2f; - color: #FFFFFF; -} - -/* ----------------------------------------------------- - * Custom Youtube - * ----------------------------------------------------- */ - -#custom-youtube { - background-color: @backgroundlight; - font-size: 16px; - color: @textcolor2; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 10px 15px 10px 0px; -} - -/* ----------------------------------------------------- - * Hardware Group - * ----------------------------------------------------- */ - - #disk,#memory,#cpu,#language { - margin:0px; - padding:0px; - font-size:16px; - color:@iconcolor; -} - -#language { - margin-right:10px; -} - -/* ----------------------------------------------------- - * Clock - * ----------------------------------------------------- */ - -#clock { - background-color: @backgrounddark; - font-size: 16px; - color: @textcolor1; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 10px 15px 10px 0px; -} - -/* ----------------------------------------------------- - * Pulseaudio - * ----------------------------------------------------- */ - -#pulseaudio { - background-color: @backgroundlight; - font-size: 16px; - color: @textcolor2; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 10px 15px 10px 0px; -} - -#pulseaudio.muted { - background-color: @backgrounddark; - color: @textcolor1; -} - -/* ----------------------------------------------------- - * Network - * ----------------------------------------------------- */ - -#network { - background-color: @backgroundlight; - font-size: 16px; - color: @textcolor2; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 10px 15px 10px 0px; -} - -#network.ethernet { - background-color: @backgroundlight; - color: @textcolor2; -} - -#network.wifi { - background-color: @backgroundlight; - color: @textcolor2; -} - -/* ----------------------------------------------------- - * Bluetooth - * ----------------------------------------------------- */ - - #bluetooth, #bluetooth.on, #bluetooth.connected { - background-color: @backgroundlight; - font-size: 16px; - color: @textcolor2; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 10px 15px 10px 0px; -} - -#bluetooth.off { - background-color: transparent; - padding: 0px; - margin: 0px; -} - -/* ----------------------------------------------------- - * Battery - * ----------------------------------------------------- */ - -#battery { - background-color: @backgroundlight; - font-size: 16px; - color: @textcolor2; - border-radius: 15px; - padding: 2px 15px 0px 10px; - margin: 10px 15px 10px 0px; -} - -#battery.charging, #battery.plugged { - color: @textcolor2; - background-color: @backgroundlight; -} - -@keyframes blink { - to { - background-color: @backgroundlight; - color: @textcolor2; + min-height: 0; + /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ + font-size: 97%; + font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; + padding: 1px; } -} - -#battery.critical:not(.charging) { - background-color: #f53c3c; - color: @textcolor3; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - -/* ----------------------------------------------------- - * Tray - * ----------------------------------------------------- */ - -#tray { - background-color: #2980b9; -} - -#tray > .passive { - -gtk-icon-effect: dim; -} - -#tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; -} - -/* ----------------------------------------------------- - * Other - * ----------------------------------------------------- */ - -label:focus { - background-color: #000000; -} - -#backlight { - background-color: #90b1b1; -} - -#network { - background-color: #2980b9; -} - -#network.disconnected { - background-color: #f53c3c; -} - + + window#waybar { + transition-property: background-color; + transition-duration: 0.5s; + background: transparent; + /*border: 2px solid @overlay0;*/ + /*background: @theme_base_color;*/ + border-radius: 10px; + } + + window#waybar.hidden { + opacity: 0.2; + } + + #waybar.empty #window { + background: none; + } + + /* This section can be use if you want to separate waybar modules */ + .modules-left, .modules-center, .modules-right { + background: @theme_base_color; + border: 0.5px solid @overlay0; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; + border-radius: 10px; + + } + + .modules-left, .modules-right { + border: 1px solid @blue; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; + } + + #backlight, + #backlight-slider, + #battery, + #bluetooth, + #clock, + #cpu, + #disk, + #idle_inhibitor, + #keyboard-state, + #memory, + #mode, + #mpris, + #network, + #pulseaudio, + #pulseaudio-slider, + #taskbar button, + #taskbar, + #temperature, + #tray, + #window, + #wireplumber, + #workspaces, + #custom-backlight, + #custom-cycle_wall, + #custom-hint, + #custom-keyboard, + #custom-light_dark, + #custom-lock, + #custom-menu, + #custom-power_vertical, + #custom-power, + #custom-swaync, + #custom-updater, + #custom-weather, + #custom-weather.clearNight, + #custom-weather.cloudyFoggyDay, + #custom-weather.cloudyFoggyNight, + #custom-weather.default, + #custom-weather.rainyDay, + #custom-weather.rainyNight, + #custom-weather.severe, + #custom-weather.showyIcyDay, + #custom-weather.snowyIcyNight, + #custom-weather.sunnyDay { + padding-top: 3px; + padding-bottom: 3px; + padding-right: 6px; + padding-left: 6px; + } + + #idle_inhibitor { + color: @blue; + } + + #bluetooth, + #backlight { + color: @blue; + } + + #battery { + color: @green; + } + + @keyframes blink { + to { + color: @surface0; + } + } + + #battery.critical:not(.charging) { + background-color: @red; + color: @theme_text_color; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; + box-shadow: inset 0 -3px transparent; + } + + #clock { + color: @yellow; + } + + #cpu { + color: @green; + } + + #custom-keyboard, + #memory { + color: @sky; + } + + #disk { + color: @sapphire; + } + + #temperature { + color: @teal; + } + + #temperature.critical { + background-color: @red; + } + + #tray > .passive { + -gtk-icon-effect: dim; + } + #tray > .needs-attention { + -gtk-icon-effect: highlight; + } + + #keyboard-state { + color: @flamingo; + } + + #workspaces button { + box-shadow: none; + text-shadow: none; + padding: 0px; + border-radius: 9px; + padding-left: 4px; + padding-right: 4px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); + } + + #workspaces button:hover { + border-radius: 10px; + color: @overlay0; + background-color: @surface0; + padding-left: 2px; + padding-right: 2px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } + + #workspaces button.persistent { + color: @surface1; + border-radius: 10px; + } + + #workspaces button.active { + color: @peach; + border-radius: 10px; + padding-left: 8px; + padding-right: 8px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } + + #workspaces button.urgent { + color: @red; + border-radius: 0px; + } + + #taskbar button.active { + padding-left: 8px; + padding-right: 8px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } + + #taskbar button:hover { + padding-left: 2px; + padding-right: 2px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } + + #custom-cava_mviz { + color: @pink; + } + + #custom-menu { + color: @rosewater; + } + + #custom-power { + color: @red; + } + + #custom-updater { + color: @red; + } + + #custom-light_dark { + color: @blue; + } + + #custom-weather { + color: @lavender; + } + + #custom-lock { + color: @maroon; + } + + #pulseaudio { + color: @sapphire; + } + + #pulseaudio.bluetooth { + color: @pink; + } + #pulseaudio.muted { + color: @red; + } + + #window { + color: @mauve; + } + + #custom-waybar-mpris { + color:@lavender; + } + + #network { + color: @teal; + } + #network.disconnected, + #network.disabled { + background-color: @surface0; + color: @text; + } + #pulseaudio-slider slider { + min-width: 0px; + min-height: 0px; + opacity: 0; + background-image: none; + border: none; + box-shadow: none; + } + + #pulseaudio-slider trough { + min-width: 80px; + min-height: 5px; + border-radius: 5px; + } + + #pulseaudio-slider highlight { + min-height: 10px; + border-radius: 5px; + } + + #backlight-slider slider { + min-width: 0px; + min-height: 0px; + opacity: 0; + background-image: none; + border: none; + box-shadow: none; + } + + #backlight-slider trough { + min-width: 80px; + min-height: 10px; + border-radius: 5px; + } + + #backlight-slider highlight { + min-width: 10px; + border-radius: 5px; + } \ No newline at end of file diff --git a/waybar/themes/ml4w-blur-custom/colored/style.css b/waybar/themes/ml4w-blur-custom/colored/style.css index f9008da..414f780 100644 --- a/waybar/themes/ml4w-blur-custom/colored/style.css +++ b/waybar/themes/ml4w-blur-custom/colored/style.css @@ -8,9 +8,9 @@ @define-color workspacesbackground1 @color5; @define-color workspacesbackground2 @color11; @define-color bordercolor @color11; -@define-color textcolor1 #FFFFFF; -@define-color textcolor2 #FFFFFF; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; +@define-color textcolor1 @foreground; +@define-color textcolor2 @foreground; +@define-color textcolor3 @foreground; +@define-color iconcolor @foreground; @import '../style.css'; diff --git a/waybar/themes/ml4w-blur-custom/config b/waybar/themes/ml4w-blur-custom/config index 70cdfcb..fa494dd 100644 --- a/waybar/themes/ml4w-blur-custom/config +++ b/waybar/themes/ml4w-blur-custom/config @@ -8,14 +8,15 @@ // by Stephan Raabe (2023) // ----------------------------------------------------- // -{ +[{ // General Settings "layer": "top", + "output": ["eDP-1", "DP-1"], "margin-top": 0, "margin-bottom": 0, "layer": "top", "margin-left": 0, - "margin-right": 0, + "margin-right": 0, "spacing": 0, // Load Modules @@ -34,26 +35,51 @@ ], // Modules Center - //"modules-center": [ - // "hyprland/workspaces" - //], + "modules-center": [ + "clock" + ], - // Modules Right + // Modules Right "modules-right": [ "custom/updates", - "pulseaudio", - //"bluetooth", + "group/hardware", + "group/hardware2", "battery", "battery#charging", - "network", - "cpu", - "memory", - //"group/hardware", - //"custom/cliphist", "tray", - "idle_inhibitor", - "custom/exit", - //"custom/ml4w-welcome", + "custom/exit" + ] +}, { + // General Settings + "layer": "top", + "output": ["HDMI-A-1"], + "margin-top": 0, + "margin-bottom": 0, + "layer": "top", + "margin-left": 0, + "margin-right": 0, + "spacing": 0, + + // Load Modules + "include": ["~/dotfiles/waybar/themes/ml4w-blur-custom/modules.json"], + + // Modules Left + "modules-left": [ + "custom/appmenuicon", + "hyprland/workspaces", + "wlr/taskbar", + "hyprland/window", + "custom/empty" + ], + + // Modules Center + // "modules-center": [ + // "clock" + // ], + + // Modules Right + "modules-right": [ "clock" ] -} +}] + diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json index b9759cd..82752b1 100644 --- a/waybar/themes/ml4w-blur-custom/modules.json +++ b/waybar/themes/ml4w-blur-custom/modules.json @@ -1,12 +1,12 @@ -// __ __ _ _ -// | \/ | ___ __| |_ _| | ___ ___ -// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| -// | | | | (_) | (_| | |_| | | __/\__ \ -// |_| |_|\___/ \__,_|\__,_|_|\___||___/ -// -// -// by Stephan Raabe (2023) -// ----------------------------------------------------- +// __ __ _ _ +// | \/ | ___ __| |_ _| | ___ ___ +// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| +// | | | | (_) | (_| | |_| | | __/\__ \ +// |_| |_|\___/ \__,_|\__,_|_|\___||___/ +// +// +// by Stephan Raabe (2023) +// ----------------------------------------------------- // { // Workspaces @@ -24,18 +24,19 @@ // START WORKSPACES "*": 3 // END WORKSPACES - } + } }, // Taskbar "wlr/taskbar": { "format": "{icon}", - "icon-size": 18, + "icon-size": 16, "tooltip-format": "{title}", "on-click": "activate", "on-click-middle": "close", "ignore-list": [ - "Alacritty" + "Alacritty", + "kitty-dropterm" ], "app_ids-mapping": { "firefoxdeveloperedition": "firefox-developer-edition" @@ -53,7 +54,9 @@ "(.*) - Chromium": "$1", "(.*) - Brave Search": "$1", "(.*) - Outlook": "$1", - "(.*) Microsoft Teams": "$1" + "(.*) Microsoft Teams": "$1", + "(.*) - Google Chrome": "$1", + "(.*) - Visual Studio Code": "$1" }, "separate-outputs": true }, @@ -78,7 +81,7 @@ "on-click": "chromium https://studio.youtube.com", "tooltip": false }, - + // Cliphist "custom/cliphist": { "format": "", @@ -90,17 +93,17 @@ // Updates Count "custom/updates": { - "format": " {}", + "format": " {}", "tooltip-format": "{}", "escape": true, - "return-type": "json", + "return-type": "json", "exec": "~/dotfiles/scripts/updates.sh", "restart-interval": 60, "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh", "on-click-right": "~/dotfiles/.settings/software.sh", "tooltip": false }, - + // Wallpaper "custom/wallpaper": { "format": "", @@ -115,7 +118,7 @@ "on-click": "~/dotfiles/waybar/themeswitcher.sh", "tooltip": false }, - + // Settings "custom/settings": { "format": "", @@ -156,7 +159,7 @@ "format": "", "on-click": "~/dotfiles/.settings/browser.sh", "tooltip": false - }, + }, // ChatGPT Launcher "custom/chatgpt": { @@ -195,7 +198,7 @@ "on-click": "rofi -show drun -replace", "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh", "tooltip": false - }, + }, // Power Menu "custom/exit": { @@ -215,40 +218,88 @@ } }, + "group/tray": { + "orientation": "inherit", + "drawer": { + "transition-duration": 300, + "children-class": "not-memory", + "transition-left-to-right": false + }, + "modules": [ + "tray" + ] + }, + // System tray "tray": { - "icon-size": 21, - "spacing": 10, + "icon-size": 16, + "spacing": 8, "verse-direction": true }, // Clock "clock": { + "calendar": { + "mode" : "year", + "mode-mon-col" : 3, + "weeks-pos" : "right", + "on-scroll" : 1, + "format": { + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}" + } + }, // TIMEDATEFORMAT - "format": "{:%H:%M - %a}", + "format": "{:%B %d %H:%M %a}", // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", + "tooltip-format": "{:%Y %B %d}\n{calendar}", // START CLOCK FORMAT "format-alt": "{:%Y-%m-%d}" // END CLOCK FORMAT }, - // System - "custom/system": { - "format": "", + // spacer + "custom/spacer": { + "format": " ", + "tooltip": false + }, + + // div + "custom/div": { + "format": "", "tooltip": false }, // CPU "cpu": { - "format": "󰒇 {usage}%", - "on-click": "alacritty -e htop" + "format": "󰒇 {usage}%", + "on-click": "alacritty -e htop", + "interval": 5, + "states": { + "warning": 50, + "critical": 90 + } }, + // "cpu#bar": { + // "format": "{icon}", + // "format-icons":[ + // "▏ ","▎ ","▍ ","▌ ","▋ ","▊ ","▉ ","█ ","█▏","█▎","█▍","█▌","█▋","█▊","█▉","██" + // ] + // }, + // Memory "memory": { "format": " {used:0.1f}G", - "on-click": "alacritty -e htop" + "on-click": "alacritty -e htop", + "interval": 10, + "states": { + "warning": 50, + "critical": 80 + } }, // Harddisc space used @@ -257,7 +308,7 @@ "format": "D {percentage_used}% ", "path": "/", "on-click": "alacritty -e htop" - }, + }, "hyprland/language": { "format": "/ K {short}" @@ -266,20 +317,36 @@ // Group Hardware "group/hardware": { "orientation": "inherit", - "drawer": { - "transition-duration": 300, - "children-class": "not-memory", - "transition-left-to-right": false - }, "modules": [ - "custom/system", - "disk", + "network#speed", + "custom/div", "cpu", - "memory", - "hyprland/language" + "custom/div", + "memory" ] }, - + + "group/hardware2": { + "orientation": "inherit", + "modules": [ + "pulseaudio", + "custom/div", + "network" + // "custom/div", + // "battery", + // "battery#charging" + ] + }, + + // Group system settings + "group/systems": { + "orientation": "inherit", + "modules": [ + // "user", + "clock" + ] + }, + // Group Settings "group/settings": { "orientation": "horizontal", @@ -305,9 +372,9 @@ // Network "network": { "format": "{ifname}", - "format-wifi": "{icon} {signalStrength}%", - "format-ethernet": " {ifname}", - "format-disconnected": "Disconnected", + "format-wifi": "{icon} {signalStrength}%", + "format-ethernet": " wired", + "format-disconnected": "󰌙", "tooltip-format": " {ifname} via {gwaddri}", "tooltip-format-wifi": " {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\nUp: {bandwidthUpBits} Down: {bandwidthDownBits}", "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}", @@ -316,6 +383,10 @@ "on-click": "~/dotfiles/.settings/networkmanager.sh", "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] }, + "network#speed": { + "format": " {bandwidthTotalBits}", + "interval": 5 + }, // Battery "battery": { @@ -324,7 +395,7 @@ "warning": 30, "critical": 15 }, - "format": "{icon} {capacity}%", + "format": "{icon} {capacity}%", "format-charging": "", "format-plugged": " {capacity}%", "format-alt": "{icon} {time}", @@ -343,7 +414,7 @@ "critical": 15 }, "format": "", - "format-charging": "{icon} {capacity}%", + "format-charging": "{icon} {capacity}%", // "format-good": "", // An empty format will hide the module //"format-icons": { // "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"], @@ -355,7 +426,7 @@ // Pulseaudio "pulseaudio": { // "scroll-step": 1, // %, can be a float - "format": "{icon}", + "format": "{icon} {volume}%", "format-bluetooth": "{icon} {format_source}", "format-bluetooth-muted": " {icon} {format_source}", "format-muted": " {format_source}", @@ -398,6 +469,6 @@ "activated": "", "deactivated": "" }, - "on-click-right": "hyprlock" + "on-click-right": "hyprlock" } } diff --git a/waybar/themes/ml4w-blur-custom/style.css b/waybar/themes/ml4w-blur-custom/style.css index b7c4a52..d1336fc 100644 --- a/waybar/themes/ml4w-blur-custom/style.css +++ b/waybar/themes/ml4w-blur-custom/style.css @@ -1,32 +1,33 @@ /* - * __ __ _ ____ _ _ - * \ \ / /_ _ _ _| |__ __ _ _ __ / ___|| |_ _ _| | ___ - * \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ - * \ V V / (_| | |_| | |_) | (_| | | ___) | |_| |_| | | __/ - * \_/\_/ \__,_|\__, |_.__/ \__,_|_| |____/ \__|\__, |_|\___| - * |___/ |___/ - * - * by Stephan Raabe (2023) - * ----------------------------------------------------- + * __ __ _ ____ _ _ + * \ \ / /_ _ _ _| |__ __ _ _ __ / ___|| |_ _ _| | ___ + * \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ + * \ V V / (_| | |_| | |_) | (_| | | ___) | |_| |_| | | __/ + * \_/\_/ \__,_|\__, |_.__/ \__,_|_| |____/ \__|\__, |_|\___| + * |___/ |___/ + * + * by Stephan Raabe (2023) + * ----------------------------------------------------- */ /* ----------------------------------------------------- - * Import Pywal colors + * Import Pywal colors * ----------------------------------------------------- */ /* @import 'style-light.css'; */ /* ----------------------------------------------------- - * General + * General * ----------------------------------------------------- */ * { - font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-family: "Fira Code Nerd Font"; + font-weight: 700; border: none; border-radius: 0px; } window#waybar { - background-color: rgba(0,0,0,0.2); + background-color: rgba(0,0,0,0.1); border-bottom: 0px solid #ffffff; /* color: #FFFFFF; */ transition-property: background-color; @@ -34,29 +35,29 @@ window#waybar { } /* ----------------------------------------------------- - * Workspaces + * Workspaces * ----------------------------------------------------- */ #workspaces { background: @workspacesbackground1; - margin: 5px 10px 6px 0px; + margin: 8px 10px 8px 0px; padding: 0px 1px; - border-radius: 15px; + border-radius: 10px; border: 0px; font-weight: bold; font-style: normal; opacity: 0.8; - font-size: 16px; + font-size: 14px; color: @textcolor1; } #workspaces button { padding: 0px 5px; - margin: 4px 3px; - border-radius: 15px; + margin: 3px; + border-radius: 10px; border: 0px; color: @textcolor1; - background-color: @workspacesbackground2; + background: @workspacesbackground2; transition: all 0.3s ease-in-out; opacity: 0.4; } @@ -64,16 +65,25 @@ window#waybar { #workspaces button.active { color: @textcolor1; background: @workspacesbackground2; - border-radius: 15px; - min-width: 40px; + border-radius: 10px; + min-width: 30px; transition: all 0.3s ease-in-out; opacity:1.0; } +#workspaces button.empty { + border-radius: 10px; + border: 0px; + color: @textcolor1; + background: transparent; + transition: all 0.3s ease-in-out; + opacity: 0.5; +} + #workspaces button:hover { color: @textcolor1; background: @workspacesbackground2; - border-radius: 15px; + border-radius: 10px; opacity:0.7; } @@ -98,12 +108,13 @@ tooltip label { * ----------------------------------------------------- */ #window { + font-family: "Fira Code Semibold"; background: @backgroundlight; - margin: 6px 15px 6px 0px; - padding: 0px 10px 0px 10px; - border-radius: 15px; + margin: 8px 10px 8px 0px; + padding: 0px 8px 0px 8px; + border-radius: 10px; color:@textcolor2; - font-size:16px; + font-size: 14px; font-weight:normal; opacity:0.8; } @@ -118,9 +129,9 @@ window#waybar.empty #window { #taskbar { background: @backgroundlight; - margin: 6px 10px 6px 0px; + margin: 8px 10px 8px 0px; padding:0px; - border-radius: 15px; + border-radius: 10px; font-weight: normal; font-style: normal; opacity:0.8; @@ -129,8 +140,15 @@ window#waybar.empty #window { #taskbar button { margin:0; - border-radius: 15px; + border-radius: 10px; padding: 0px 5px 0px 5px; + opacity: 0.7; +} + +#taskbar button.active { + background: @workspacesbackground2; + border-radius: 10px; + opacity:1.0; } @@ -138,19 +156,19 @@ window#waybar.empty #window { * Custom Quicklinks * ----------------------------------------------------- */ -#custom-brave, -#custom-browser, -#custom-keybindings, -#custom-outlook, -#custom-filemanager, -#custom-teams, -#custom-chatgpt, -#custom-calculator, -#custom-windowsvm, -#custom-cliphist, -#custom-wallpaper, -#custom-settings, -#custom-wallpaper, +#custom-brave, +#custom-browser, +#custom-keybindings, +#custom-outlook, +#custom-filemanager, +#custom-teams, +#custom-chatgpt, +#custom-calculator, +#custom-windowsvm, +#custom-cliphist, +#custom-wallpaper, +#custom-settings, +#custom-wallpaper, #custom-system, #custom-waybarthemes { margin-right: 23px; @@ -159,7 +177,7 @@ window#waybar.empty #window { opacity: 0.8; color: @iconcolor; } - + #custom-system { margin-right:15px; } @@ -194,7 +212,7 @@ window#waybar.empty #window { #idle_inhibitor { margin-right: 15px; - font-size: 22px; + font-size: 16px; font-weight: bold; opacity: 0.8; color: @iconcolor; @@ -214,13 +232,13 @@ window#waybar.empty #window { #custom-appmenu, #custom-appmenuicon { background-color: @backgrounddark; - font-size: 16px; + font-size: 14px; color: @textcolor1; - border-radius: 15px; + border-radius: 10px; padding: 0px 10px 0px 10px; - margin: 6px 10px 6px 10px; + margin: 8px 10px 8px 10px; opacity:0.8; - border:3px solid @bordercolor; + /* border:3px solid @bordercolor; */ } #custom-appmenuicon { @@ -233,10 +251,13 @@ window#waybar.empty #window { * ----------------------------------------------------- */ #custom-exit { - margin: 0px 15px 0px 0px; - padding:0px; - font-size:20px; + margin: 8px 10px 8px 0px; + padding:0px 14px 0px 10px; + font-size: 14px; color: @iconcolor; + background: @backgrounddark; + border-radius: 10px; + opacity: 0.8; } /* ----------------------------------------------------- @@ -245,9 +266,9 @@ window#waybar.empty #window { #custom-updates { background-color: @backgroundlight; - font-size: 16px; + font-size: 14px; color: @textcolor2; - border-radius: 15px; + border-radius: 10px; padding: 2px 10px 0px 10px; margin: 8px 10px 8px 0px; opacity:0.8; @@ -273,9 +294,9 @@ window#waybar.empty #window { #custom-youtube { background-color: @backgroundlight; - font-size: 16px; + font-size: 14px; color: @textcolor2; - border-radius: 15px; + border-radius: 10px; padding: 2px 10px 0px 10px; margin: 8px 15px 8px 0px; opacity:0.8; @@ -285,14 +306,43 @@ window#waybar.empty #window { * Hardware Group * ----------------------------------------------------- */ - #disk,#memory,#cpu,#language { + /* #disk,#memory,#cpu,#language { background-color: @backgroundlight; - font-size: 16px; + font-size: 14px; color: @textcolor2; - border-radius: 15px; + border-radius: 10px; padding: 2px 10px 0px 10px; margin: 8px 10px 8px 0px; opacity:0.8; +} */ + +/* #cpu { + color: @color2; +} */ + +#cpu.warning,#memory.warning{ + color: #ff9800; +} + +#cpu.critical,#memory.warning{ + color: #f44336; +} + +#hardware,#hardware2 { + background-color: @backgroundlight; + font-size: 14px; + color: @textcolor2; + border-radius: 10px; + padding: 0px 10px 0px 10px; + margin: 8px 10px 8px 0px; + opacity:0.8; +} + +#custom-div { + font-weight: 900; + padding: 0px 2px; + color: @color2; + font-size: 18px; } #language { @@ -304,14 +354,14 @@ window#waybar.empty #window { * ----------------------------------------------------- */ #clock { - background-color: @backgrounddark; - font-size: 16px; + background-color: @backgroundlight; + font-size: 14px; color: @textcolor1; - border-radius: 15px; - padding: 1px 10px 0px 10px; - margin: 6px 10px 6px 0px; + border-radius: 10px; + padding: 0px 8px 0px 8px; + margin: 8px 10px 8px 0px; opacity:0.8; - border:3px solid @bordercolor; + /* border:3px solid @bordercolor; */ } /* ----------------------------------------------------- @@ -319,41 +369,51 @@ window#waybar.empty #window { * ----------------------------------------------------- */ #pulseaudio { - background-color: @backgroundlight; - font-size: 16px; + /* background-color: @backgroundlight; */ + font-size: 14px; color: @textcolor2; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 8px 10px 8px 0px; - opacity:0.8; + /* border-radius: 10px; */ + /* padding: 0px 10px 0px 10px; */ + /* margin: 8px 10px 8px 0px; */ + /* opacity:0.8; */ } #pulseaudio.muted { - background-color: @backgrounddark; + /* background-color: @backgrounddark; */ color: @textcolor1; } +#systems { + background-color: @backgroundlight; + font-size: 14px; + color: @textcolor2; + border-radius: 10px; + padding: 0px 10px 0px 10px; + margin: 8px 10px 8px 0px; + opacity:0.8; +} + /* ----------------------------------------------------- * Network * ----------------------------------------------------- */ #network { - background-color: @backgroundlight; - font-size: 16px; + /* background-color: @backgroundlight; */ + font-size: 14px; color: @textcolor2; - border-radius: 15px; - padding: 2px 10px 0px 10px; - margin: 8px 10px 8px 0px; - opacity:0.8; + /* border-radius: 10px; */ + /* padding: 2px 2px 0px 10px; */ + /* margin: 8px 10px 8px 0px; */ + /* opacity:0.8; */ } #network.ethernet { - background-color: @backgroundlight; + /* background-color: @backgroundlight; */ color: @textcolor2; } #network.wifi { - background-color: @backgroundlight; + /* background-color: @backgroundlight; */ color: @textcolor2; } @@ -363,12 +423,12 @@ window#waybar.empty #window { #bluetooth, #bluetooth.on, #bluetooth.connected { background-color: @backgroundlight; - font-size: 16px; + font-size: 14px; color: @textcolor2; - border-radius: 15px; + border-radius: 10px; padding: 2px 10px 0px 10px; margin: 8px 10px 8px 0px; - opacity:0.8; + /* opacity:0.8; */ } #bluetooth.off { @@ -383,10 +443,10 @@ window#waybar.empty #window { #battery { background-color: @backgroundlight; - font-size: 16px; + font-size: 14px; color: @textcolor2; - border-radius: 15px; - padding: 2px 15px 0px 10px; + border-radius: 10px; + padding: 0px 10px 0px 10px; margin: 8px 10px 8px 0px; opacity:0.8; } @@ -418,8 +478,13 @@ window#waybar.empty #window { * ----------------------------------------------------- */ #tray { - padding: 0px 10px 0px 0px; + padding: 0px 10px 0px 10px; color: @textcolor3; + background-color: @backgroundlight; + font-size: 14px; + border-radius: 10px; + margin: 8px 10px 8px 0px; + opacity:0.8; } #tray > .passive {