.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

.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

.install/packages/general-packages.sh

@@ -24,6 +24,7 @@ packagesPacman=(
     "ttf-fira-sans" 
     "ttf-fira-code"
     "ttf-firacode-nerd"
+    "ttf-firacode-nerd" 
     "figlet" 
     "vlc" 
     "eza" 
@@ -62,8 +63,7 @@ packagesPacman=(
 );
 
 packagesYay=(
-    "pfetch" 
+    "vimix-cursors"
-    "bibata-cursor-theme" 
     "trizen"
     "pacseek"
 );

.install/packages/hyprland-packages.sh

@@ -9,9 +9,11 @@ packagesPacman=(
     "cliphist"
     "hyprlock"
     "hypridle"
+    "kitty"
 );
 
 packagesYay=(
+    "pyprland"
     "swww" 
     "wlogout"
     "nwg-look"

.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
+        # wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
-        unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
+        # unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
-        if [ ! -d ~/wallpaper/ ]; then
+        # if [ ! -d ~/wallpaper/ ]; then
-            mkdir ~/wallpaper
+        #     mkdir ~/wallpaper
-        fi
+        # fi
-        cp ~/Downloads/wallpaper-main/* ~/wallpaper/
+        # 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

.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

chrome-flags.conf

@@ -0,0 +1 @@
+--ozone-platform=wayland --enable-wayland-ime

fastfetch/config.jsonc

@@ -155,10 +155,10 @@
             "compact": true,
             "keyColor": "blue"
         },
+        "break",
         {
-            "type": "colors",
+            "type": "custom",
-            "paddingLeft": 4,
+            "format": " \u001b[90m󱓻  \u001b[31m󱓻  \u001b[32m󱓻  \u001b[33m󱓻  \u001b[34m󱓻  \u001b[35m󱓻  \u001b[36m󱓻  \u001b[37m󱓻  \u001b[38m󱓻  \u001b[39m󱓻"
-            "symbol": "circle"
         }
     ]
 }

hypr/conf/animation.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/animation-moving.conf
+source = ~/dotfiles/hypr/conf/animations/animations-high.conf

hypr/conf/autostart.conf

@@ -32,3 +32,5 @@ exec-once = ~/.config/ml4w-hyprland-settings/hyprctl.sh
 
 # Start ewww daemon
 exec-once = ~/dotfiles/hypr/scripts/eww.sh
+
+exec-once = pypr

hypr/conf/cursor.conf

@@ -1 +1 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+exec-once = hyprctl setcursor Vimix 24

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

hypr/conf/keyboard.conf

@@ -3,7 +3,7 @@
 # https://wiki.hyprland.org/Configuring/Variables/#input
 # -----------------------------------------------------
 input {
-    kb_layout = de
+    kb_layout = us
     kb_variant =
     kb_model =
     kb_options =
@@ -11,7 +11,9 @@ input {
     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.
 }

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
 }
+

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

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%"

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

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"

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';

waybar/themes/custom/config

@@ -1,73 +1,70 @@
-// __        __          _                 
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-// \ \      / /_ _ _   _| |__   __ _ _ __  
+
-//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+// ### DEFAULT Top -Laptop ### //
-//   \ V  V / (_| | |_| | |_) | (_| | |    
-//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
-//                 |___/                   
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
 {
-    // General Settings
+    "include": "~/dotfiles/waybar/themes/custom/modules.json",
-
-    // Position TOP
     "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",
+        "hyprland/workspaces#pacman",
-        "custom/settings",
+        "custom/separator#dot-line",
-        "custom/waybarthemes",
+        "cpu",
-        "custom/wallpaper",
+        "custom/separator#dot-line",
-        // START TASK TOOGLE
+        "temperature",
-        // "wlr/taskbar",
+        "custom/separator#dot-line",
-        // END TASK TOOGLE
+        "memory",
-        "group/quicklinks",
+        "custom/separator#dot-line",
-        "hyprland/window",
+        "custom/weather",
-        "custom/starter"
+        "custom/separator#blank_3",
+        "custom/cava_mviz",
         ],
 
-    // Modules Center
     "modules-center": [
-        "hyprland/workspaces"
+        "custom/menu",
+        "custom/separator#dot-line",
+        "idle_inhibitor",
+        "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    
     "modules-right": [
-        "custom/updates",
+        "network#speed",
-        "pulseaudio",
+        "custom/separator#dot-line",
-        // START BT TOOGLE
+        "custom/swaync",
-        "bluetooth",
-        // END BT TOOGLE
-        "battery", 
-        // START NETWORK TOOGLE
-        "network",
-        // END NETWORK TOOGLE
-        "group/hardware",
-        "custom/cliphist",
-        // START IDLE TOOGLE
-        "idle_inhibitor",
-        // END IDLE TOOGLE
-        // START TRAY TOOGLE
         "tray",
-        // END TRAY TOOGLE
+        "mpris",
-        "custom/exit",
+        "custom/separator#dot-line",
-        "custom/ml4w-welcome",
+        "bluetooth",
-        "clock"
+        "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",
+        ],
+    }

waybar/themes/custom/style.css

@@ -1,430 +1,314 @@
-/*
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
- * __        __          _                  ____  _         _       
+/* Catppuccin Mocha */
- * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
- *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
- *   \ 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 
- * ----------------------------------------------------- */
 
 * {
-    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-family: "JetBrainsMono Nerd Font";
-    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-weight: bold;
-    font-style: normal;
+    min-height: 0;
-    font-size: 16px;
+    /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-    color: @textcolor1;
+    font-size: 97%;
-}
+    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-
+    padding: 1px;
-#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;
     }
     
+    window#waybar {
+      transition-property: background-color;
+      transition-duration: 0.5s;
+      background: transparent;
+      /*border: 2px solid @overlay0;*/
+      /*background: @theme_base_color;*/
+      border-radius: 10px;
+    }
     
- #custom-ml4w-welcome {
+    window#waybar.hidden {
-    margin-right: 15px;
+      opacity: 0.2;
-    background-image: url("../assets/ml4w-icon.png");
+    }
-    background-repeat: no-repeat;
-    background-position: center;
-    padding-right: 24px;
-}
     
-/* -----------------------------------------------------
+    #waybar.empty #window {
- * Idle Inhibator
+      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 {
-    margin-right: 15px;
+      color: @blue;
-    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;
     }
-}
     
-#battery.critical:not(.charging) {
+    #bluetooth,
-    background-color: #f53c3c;
+    #backlight {
-    color: @textcolor3;
+      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 {
- * Tray
+      color: @yellow;
- * ----------------------------------------------------- */
+    }
     
-#tray {
+    #cpu {
-    background-color: #2980b9;
+      color: @green;
-}
+    }
     
-#tray > .passive {
+    #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 {
-#tray > .needs-attention {
       -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
+    }
-}
     
-/* -----------------------------------------------------
+    #keyboard-state {
- * Other
+      color: @flamingo;
- * ----------------------------------------------------- */
+    }
     
-label:focus {
+    #workspaces button {
-    background-color: #000000;
+        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);
+    }
     
-#backlight {
+    #workspaces button:hover {
-    background-color: #90b1b1;
+        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);
+    }
     
-#network {
+    #workspaces button.persistent {
-    background-color: #2980b9;
+        color: @surface1;
-}
+        border-radius: 10px;
+    }
     
-#network.disconnected {
+    #workspaces button.active {
-    background-color: #f53c3c;
+        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;
+    }

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 textcolor1 @foreground;
-@define-color textcolor2 #FFFFFF;
+@define-color textcolor2 @foreground;
-@define-color textcolor3 #FFFFFF;
+@define-color textcolor3 @foreground;
-@define-color iconcolor #FFFFFF;
+@define-color iconcolor @foreground;
 
 @import '../style.css';

waybar/themes/ml4w-blur-custom/config

@@ -8,9 +8,10 @@
 // by Stephan Raabe (2023) 
 // ----------------------------------------------------- 
 //
-{
+[{
     // General Settings
     "layer": "top",
+    "output": ["eDP-1", "DP-1"],
     "margin-top": 0,
     "margin-bottom": 0,
     "layer": "top",
@@ -34,26 +35,51 @@
     ],
 
     // Modules Center
-    //"modules-center": [
+    "modules-center": [
-    //    "hyprland/workspaces"
+       "clock"
-    //],
+    ],
 
     // Modules Right
     "modules-right": [
         "custom/updates",
-        "pulseaudio",
+        "group/hardware",
-        //"bluetooth",
+        "group/hardware2",
         "battery",
         "battery#charging",
-        "network",
-        "cpu",
-        "memory",
-        //"group/hardware",
-        //"custom/cliphist",
         "tray",
-        "idle_inhibitor",
+        "custom/exit"
-        "custom/exit",
+    ]
-        //"custom/ml4w-welcome",
+}, {
+    // 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"
     ]
-}
+}]
+

waybar/themes/ml4w-blur-custom/modules.json

@@ -30,12 +30,13 @@
     // 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
     },
@@ -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,
+        "icon-size": 16,
-        "spacing": 10,
+        "spacing": 8,
         "verse-direction": true
     },
 
     // Clock
     "clock": {
+        "calendar": {
+            "mode"          : "year",
+            "mode-mon-col"  : 3,
+            "weeks-pos"     : "right",
+            "on-scroll"     : 1,
+            "format": {
+                      "months":     "<span color='#ffead3'><b>{}</b></span>",
+                      "days":       "<span color='#ecc6d9'><b>{}</b></span>",
+                      "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
+                      "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
+                      "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
+                      }
+            },
         // TIMEDATEFORMAT
-        "format": "{:%H:%M - %a}",
+        "format": "{:%B %d %H:%M %a}",
         // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "tooltip-format": "<big>{:%Y %B %d}</big>\n<tt><small>{calendar}</small></tt>",
         // START CLOCK FORMAT
         "format-alt": "{:%Y-%m-%d}"
         // END CLOCK FORMAT
     },
 
-    // System
+    // spacer
-    "custom/system": {
+    "custom/spacer": {
-        "format": "",
+        "format": " ",
+        "tooltip": false
+    },
+
+    // div
+    "custom/div": {
+        "format": "",
         "tooltip": false
     },
 
     // CPU
     "cpu": {
         "format": "󰒇 {usage}%",
-        "on-click": "alacritty -e htop"
+        "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
@@ -266,17 +317,33 @@
     // Group Hardware
     "group/hardware": {
         "orientation": "inherit",
-        "drawer": {
-            "transition-duration": 300,
-            "children-class": "not-memory",
-            "transition-left-to-right": false
-        },        
         "modules": [
-            "custom/system",
+            "network#speed",
-            "disk",
+            "custom/div",
             "cpu",
-            "memory",
+            "custom/div",
-            "hyprland/language"
+            "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"
         ]
     },
 
@@ -306,8 +373,8 @@
     "network": {
         "format": "{ifname}",
         "format-wifi": "{icon} {signalStrength}%",
-        "format-ethernet": "  {ifname}",
+        "format-ethernet": " wired",
-        "format-disconnected": "Disconnected",
+        "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": {
@@ -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}",

waybar/themes/ml4w-blur-custom/style.css

@@ -20,13 +20,14 @@
  * ----------------------------------------------------- */
 
 * {
-    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;
@@ -39,24 +40,24 @@ window#waybar {
 
 #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;
+    margin: 3px;
-    border-radius: 15px;
+    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;
+    border-radius: 10px;
-    min-width: 40px;
+    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;
+    margin: 8px 10px 8px 0px;
-    padding: 0px 10px 0px 10px;
+    padding: 0px 8px 0px 8px;
-    border-radius: 15px;
+    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;
 }
 
 
@@ -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;
+    margin: 8px 10px 8px 0px;
-    padding:0px;
+    padding:0px 14px 0px 10px;
-    font-size:20px;
+    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;
+    background-color: @backgroundlight;
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor1;
-    border-radius: 15px;
+    border-radius: 10px;
-    padding: 1px 10px 0px 10px;
+    padding: 0px 8px 0px 8px;
-    margin: 6px 10px 6px 0px;
+    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;
+    /* background-color: @backgroundlight; */
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor2;
-    border-radius: 15px;
+    /* border-radius: 10px; */
-    padding: 2px 10px 0px 10px;
+    /* padding: 0px 10px 0px 10px; */
-    margin: 8px 10px 8px 0px;
+    /* margin: 8px 10px 8px 0px; */
-    opacity:0.8;
+    /* 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;
+    /* background-color: @backgroundlight; */
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor2;
-    border-radius: 15px;
+    /* border-radius: 10px; */
-    padding: 2px 10px 0px 10px;
+    /* padding: 2px 2px 0px 10px; */
-    margin: 8px 10px 8px 0px;
+    /* margin: 8px 10px 8px 0px; */
-    opacity:0.8;
+    /* 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;
+    border-radius: 10px;
-    padding: 2px 15px 0px 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 {