Merge branch 'upstream-custom' into dev

merge hidpi support

.install/cleanup.sh

@@ -13,24 +13,6 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
     fi
 fi
 
-# Check for running NetworkManager.service
-if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then
-    echo ":: NetworkManager.service already running."
-else
-    sudo systemctl enable NetworkManager.service
-    sudo systemctl start NetworkManager.service
-    echo ":: NetworkManager.service activated successfully."    
-fi
-
-# Check for running bluetooth.service
-if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then
-    echo ":: bluetooth.service already running."
-else
-    sudo systemctl enable bluetooth.service
-    sudo systemctl start bluetooth.service
-    echo ":: bluetooth.service activated successfully."    
-fi
-
 if [ -d ~/dotfiles/hypr/settings/ ] ;then
     rm -rf ~/dotfiles/hypr/settings
     echo ":: ~/dotfiles/hypr/settings removed."

.install/hidpi.sh

@@ -0,0 +1,17 @@
+
+# ------------------------------------------------------
+# hidpi support
+# ------------------------------------------------------
+
+echo -e "${GREEN}"
+figlet "hidpi"
+echo -e "${NONE}"
+
+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\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,11 @@ 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
+if [ -d ~/dotfiles-versions/$version/Vimix-hyprcursors ]; then
+    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors
+fi
 echo ":: Symbolic links created."
 echo

.install/packages/general-packages.sh

@@ -1,65 +1,57 @@
 packagesPacman=(
     "pacman-contrib"
     "vim"
-    "bluez"
+    "bat"
-    "bluez-utils"
+    "fzf"
+    "zsh"
+    "fastfetch"
+    "ranger"
+    "btop"
     "neovim"
     "wget"
     "unzip"
-    "alacritty" 
+    "alacritty"
-    "chromium" 
+    "dunst"
-    "dunst" 
     "starship"
-    "mpv" 
+    "mpv"
     "thunar"
-    "nautilus" 
+    "nautilus"
-    "mousepad"
+    "noto-fonts"
-    "noto-fonts" 
+    "otf-font-awesome"
-    "otf-font-awesome" 
+    "ttf-fira-sans"
-    "ttf-fira-sans" 
+    "ttf-fira-code"
-    "ttf-fira-code" 
+    "ttf-firacode-nerd"
-    "ttf-firacode-nerd" 
+    "ttf-firacode-nerd"
-    "figlet" 
+    "figlet"
-    "vlc" 
+    "vlc"
-    "eza" 
+    "eza"
-    "python-pip" 
+    "python-pip"
-    "python-psutil" 
+    "python-psutil"
-    "python-rich" 
+    "python-rich"
-    "python-click" 
     "python-pywal"
-    "python-gobject"
+    "pavucontrol"
-    "pavucontrol" 
+    "tumbler"
-    "tumbler" 
     "papirus-icon-theme"
-    "breeze-icons"
-    "polkit-gnome"
-    "brightnessctl"
     "gum"
     "man-pages"
-    "nm-connection-editor"
     "gvfs"
     "xdg-user-dirs"
     "xdg-desktop-portal-gtk"
-    "networkmanager"
-    "network-manager-applet"
     "xarchiver"
     "thunar-archive-plugin"
     "zip"
     "fuse2"
-    "gtk4"
-    "libadwaita"
     "xdg-desktop-portal"
     "qalculate-gtk"
     "imagemagick"
-    "guvcview"
     "jq"
     "rofi-wayland"
     "fastfetch"
-    "blueman"
 );
 
 packagesYay=(
-    "bibata-cursor-theme" 
+    "vimix-cursors"
+    "orchis-theme"
     "trizen"
-    "pacseek"
+    "google-chrome"
 );

.install/packages/hyprland-packages.sh

@@ -3,15 +3,17 @@ packagesPacman=(
     "hyprpaper"
     "hyprlock"
     "hypridle"
-    "xdg-desktop-portal-hyprland" 
+    "xdg-desktop-portal-hyprland"
-    "waybar" 
+    "waybar"
-    "grim" 
+    "grim"
     "slurp"
     "swappy"
     "cliphist"
+    "kitty"
 );
 
 packagesYay=(
+    "pyprland"
     "wlogout"
     "nwg-look"
     "eww"

.install/qtile-dotfiles.sh

@@ -35,4 +35,7 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
     _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
+if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
+    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
+fi
 echo ":: Symbolic links created."

.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

.settings/browser.sh

@@ -1 +1 @@
-chromium
+google-chrome-stable

.settings/editor.sh

@@ -1 +1 @@
-mousepad
+~/dotfiles/.settings/terminal.sh -e vim

.settings/networkmanager.sh

@@ -1 +0,0 @@
-nm-connection-editor

.settings/rofi-border-radius.rasi

@@ -0,0 +1,3 @@
+* {
+    border-radius:  15px;
+}

.settings/rofi-border.rasi

@@ -1,4 +1,3 @@
 * {
     border-width:   2px;
-    border-radius:  15px;
 }

.settings/software.sh

@@ -1 +0,0 @@
-alacritty -e pacseek

.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

Vimix-hyprcursors/manifest.hl

@@ -0,0 +1,4 @@
+name = Extracted Theme
+description = Automatically extracted with hyprcursor-util
+version = 0.1
+cursors_directory = hyprcursors

alacritty/alacritty.toml

@@ -1,5 +1,5 @@
 [font]
-size = 12.0
+size = 16.0
 
 [font.normal]
 family = "FiraCode Nerd Font"
@@ -11,3 +11,6 @@ opacity = 0.7
 [window.padding]
 x = 15
 y = 15
+
+[selection]
+save_to_clipboard = true

chrome-flags.conf

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

fastfetch/config.jsonc

@@ -1,110 +1,165 @@
-//  Thanks to Bina
+// Note that you must replace the image path to an existing image to display it.
+
 {
-  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-  "logo": {
+    // "logo": {
-      "padding": {
+    //     "type": "iterm",
-      "top": 2
+    //     "source": "/Users/carter/Desktop/apple1.png",
-      }
+    //     "width": 28,
-  },
+    //     "height": 12
-  "display": {
+    // },
-        "separator": " ➜  "
+    "display": {
-  },
+    //    "separator": "  "
-  "modules": [
+        "separator": " "
-      "break",
+    },
-      "break",
+    "modules": [
-      "break",
+        {
-       {
+            "type": "host",
-          "type": "os",
+            "key": "╭─󰌢",
-          "key": "OS   ",
+            "keyColor": "green"
-          "keyColor": "31",  // = color1
+        },
-      },
+        {
-      {
+            "type": "cpu",
-          "type": "kernel",
+            "key": "├─󰻠",
-          "key": " ├  ",
+            "keyColor": "green"
-          "keyColor": "31",
+        },
-      },
+        {
-      {
+            "type": "gpu",
-          "type": "packages",
+            "key": "├─󰍛",
-          "format": "{} (pacman)",
+            "keyColor": "green"
-          "key": " ├ 󰏖 ",
+        },
-          "keyColor": "31",  
+        {
-      },
+            "type": "disk",
-      {
+            "key": "├─",
-          "type": "shell",
+            "keyColor": "green"
-          "key": " └  ",
+        },
-          "keyColor": "31", 
+        {
-      },
+            "type": "memory",
-      "break",
+            "key": "├─󰑭",
-      {
+            "keyColor": "green"
-          "type": "wm",
+        },
-          "key": "WM   ",
+        {
-          "keyColor": "32", 
+            "type": "swap",
-      },
+            "key": "├─󰓡",
-      {
+            "keyColor": "green"
-          "type": "wmtheme",
+        },
-          "key": " ├ 󰉼 ",
+        {
-          "keyColor": "32",
+            "type": "display",
-      },
+            "key": "├─󰍹",
-      {
+            "keyColor": "green"
-          "type": "icons",
+        },
-          "key": " ├ 󰀻 ",
+        {
-          "keyColor": "32",
+            "type": "battery",
-      },
+            "key": "├─",
-      {
+            "keyColor": "green"
-          "type": "cursor",
+        },
-          "key": " ├  ",
+        {
-          "keyColor": "32", 
+            "type": "poweradapter",
-      },
+            "key": "├─",
-      {
+            "keyColor": "green"
-          "type": "terminal",
+        },
-          "key": " ├  ",
+        {
-          "keyColor": "32",
+            "type": "gamepad",
-      },
+            "key": "├─",
-      {
+            "keyColor": "green"
-          "type": "terminalfont",
+        },
-          "key": " └  ",
+        {
-          "keyColor": "32", 
+            "type": "bluetooth",
-      },
+            "key": "├─",
-      "break",
+            "keyColor": "green"
-      {
+        },
-          "type": "host",
+        {
-          "format": "{5} {1} Type {2}",
+            "type": "sound",
-          "key": "PC   ",
+            "key": "╰─",
-          "keyColor": "33",
+            "keyColor": "green"
-      },
+        },
-      {
+        "break",
-          "type": "cpu",
+
-          "format": "{1} ({3}) @ {7} GHz",
+        {
-          "key": " ├  ",
+            "type": "shell",
-          "keyColor": "33",
+            "key": "╭─",
-      },
+            "keyColor": "yellow"
-      {
+        },
-          "type": "gpu",
+        {
-          "format": "{1} {2} @ {12} GHz",            
+            "type": "terminal",
-          "key": " ├ 󰢮 ",
+            "key": "├─",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      {
+        {
-          "type": "memory",
+            "type": "terminalfont",
-          "key": " ├  ",
+            "key": "├─",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      {
+        {
-          "type": "swap",
+            "type": "lm",
-          "key": " ├ 󰓡 ",
+            "key": "├─󰧨",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      {
+        {
-          "type": "disk",
+            "type": "de",
-          "key": " ├ 󰋊 ",
+            "key": "├─",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      {
+        {
-          "type": "monitor",
+            "type": "wm",
-          "key": " └  ",
+            "key": "├─",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      "break",
+        {
-      "break",
+            "type": "theme",
-  ]
+            "key": "├─󰉼",
-}
+            "keyColor": "yellow"
+        },
+        {
+            "type": "icons",
+            "key": "╰─󰀻",
+            "keyColor": "yellow"
+        },
+
+        "break",
+        {
+            "type": "title",
+            "key": "╭─",
+            "format": "{1}@{2}",
+            "keyColor": "blue"
+        },
+        {
+            "type": "os",
+            "key": "├─󰣇", // Just get your distro's logo off nerdfonts.com
+            "keyColor": "blue"
+        },
+        {
+            "type": "kernel",
+            "key": "├─",
+            "format": "{1} {2}",
+            "keyColor": "blue"
+        },
+        {
+            "type": "packages",
+            "key": "├─󰏖",
+            "keyColor": "blue"
+        },
+        {
+            "type": "uptime",
+            "key": "├─󰅐",
+            "keyColor": "blue"
+        },
+        {
+            "type": "media",
+            "key": "├─󰝚",
+            "keyColor": "blue"
+        },
+        {
+            "type": "localip",
+            "key": "╰─󰩟",
+            "compact": true,
+            "keyColor": "blue"
+        },
+        "break",
+        {
+            "type": "custom",
+            "format": " \u001b[90m󱓻  \u001b[31m󱓻  \u001b[32m󱓻  \u001b[33m󱓻  \u001b[34m󱓻  \u001b[35m󱓻  \u001b[36m󱓻  \u001b[37m󱓻  \u001b[38m󱓻  \u001b[39m󱓻"
+        }
+    ]
+}
+

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

@@ -29,8 +29,8 @@ exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
 # Start ewww daemon
 exec-once = ~/dotfiles/hypr/scripts/eww.sh
 
+exec-once = pypr
+
+
 # Start autostart cleanup
 exec-once = ~/dotfiles/hypr/scripts/cleanup.sh
-
-# Load configuration from ML4W Hyprland Settings App
-exec = ~/.config/ml4w-hyprland-settings/hyprctl.sh

hypr/conf/cursor.conf

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

hypr/conf/hidpi.conf

@@ -0,0 +1,6 @@
+xwayland {
+  force_zero_scaling = true
+}
+
+env = GDK_SCALE,2
+env = QT_SCALE_FACTOR=2

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/keybindings/default.conf

@@ -40,7 +40,6 @@ bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
 bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
 bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
 bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
-bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
 bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
 bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
 bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh

hypr/conf/keyboard.conf

@@ -3,15 +3,17 @@
 # https://wiki.hyprland.org/Configuring/Variables/#input
 # -----------------------------------------------------
 input {
-    kb_layout = de
+    kb_layout = us
-    kb_variant = 
+    kb_variant =
     kb_model =
     kb_options =
     numlock_by_default = true
     follow_mouse = 1
     mouse_refocus=false
     touchpad {
-        natural_scroll = false
+        natural_scroll = true
+        disable_while_typing=true
+        tap-to-click=true
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }

hypr/conf/layouts/laptop.conf

@@ -12,5 +12,12 @@ master {
 }
 
 gestures {
-    workspace_swipe = true
+  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/misc.conf

@@ -5,4 +5,6 @@
 misc {
     disable_hyprland_logo = true
     disable_splash_rendering = true
+    enable_swallow = true
+    swallow_regex = ^(Alacritty)$
 }

hypr/conf/monitors/4k.conf

@@ -0,0 +1,6 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+monitor=,preferred,auto,2

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/conf/windowrules/custom.conf

@@ -16,3 +16,4 @@ layerrule = blur, logout_dialog
 
 windowrule = float,title=^(Mathematica)$
 windowrule = opacity 0.75, ^(Code)$
+windowrule = float,^(QQ)$

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

hypr/scripts/screenshot.sh

@@ -14,10 +14,11 @@ NAME="screenshot_$(date +%d%m%Y_%H%M%S).png"
 
 option2="Selected area"
 option3="Fullscreen (delay 3 sec)"
+option4="Current display (delay 3 sec)"
 
-options="$option2\n$option3"
+options="$option2\n$option3\n$option4"
 
-choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 2 -width 30 -p "Take Screenshot")
+choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 3 -width 30 -p "Take Screenshot")
 
 case $choice in
     $option2)
@@ -33,4 +34,12 @@ case $choice in
         notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
         swappy -f "$DIR$NAME"
     ;;
+    $option4)
+        sleep 3
+        monitor="$(hyprctl monitors | awk '/Monitor/{monitor=$2} /focused: yes/{print monitor; exit}')"
+        grim -o "$monitor" "$DIR$NAME"
+        xclip -selection clipboard -t image/png -i "$DIR$NAME"
+        notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
+        swappy -f "$DIR$NAME"
+    ;;
 esac

install.sh

@@ -62,6 +62,7 @@ if [[ $profile == *"Qtile"* ]]; then
     source .install/install-packages.sh
 fi
 source .install/wallpaper.sh
+source .install/hidpi.sh
 source .install/displaymanager.sh
 source .install/issue.sh
 source .install/restore.sh

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

rofi/config-cliphist.rasi

@@ -38,6 +38,7 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {

rofi/config-compact.rasi

@@ -39,6 +39,7 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {

rofi/config-power.rasi

@@ -38,6 +38,7 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {

rofi/config-screenshot.rasi

@@ -38,6 +38,7 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {

rofi/config-short.rasi

@@ -38,6 +38,7 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {

rofi/config-themes.rasi

@@ -38,6 +38,7 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {

rofi/config-wallpaper.rasi

@@ -33,6 +33,7 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {

rofi/config.rasi

@@ -39,6 +39,7 @@ configuration {
 
 /* ---- Load border width ---- */
 @import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"
 
 /* ---- Window ---- */
 window {

scripts/filemanager.sh

@@ -1 +0,0 @@
-thunar

scripts/installtimeshift.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-#  _____ _                     _     _  __ _   
-# |_   _(_)_ __ ___   ___  ___| |__ (_)/ _| |_ 
-#   | | | | '_ ` _ \ / _ \/ __| '_ \| | |_| __|
-#   | | | | | | | | |  __/\__ \ | | | |  _| |_ 
-#   |_| |_|_| |_| |_|\___||___/_| |_|_|_|  \__|
-#                                              
-
-sleep 1
-clear
-figlet "Timeshift"
-
-_isInstalledYay() {
-    package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
-    if [ -n "${check}" ] ; then
-        echo 0; #'0' means 'true' in Bash
-        return; #true
-    fi;
-    echo 1; #'1' means 'false' in Bash
-    return; #false
-}
-
-timeshift_installed=$(_isInstalledYay "timeshift")
-grubbtrfs_installed=$(_isInstalledYay "grub-btrfs")
-
-if [[ $timeshift_installed == "0" ]] ;then
-    echo ":: Timeshift is already installed"
-else
-    if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then
-        yay -S timeshift
-    fi
-fi
-if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "0" ]] ;then
-    echo ":: grub-btrfs is already installed"
-else
-    echo ":: grub-btrfs is required to select a snapshot on grub bootloader."
-    if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then
-        yay -S grub-btrfs
-    fi
-fi
-sleep 3

scripts/installupdates.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-#  ___           _        _ _   _   _           _       _             
-# |_ _|_ __  ___| |_ __ _| | | | | | |_ __   __| | __ _| |_ ___  ___  
-#  | || '_ \/ __| __/ _` | | | | | | | '_ \ / _` |/ _` | __/ _ \/ __| 
-#  | || | | \__ \ || (_| | | | | |_| | |_) | (_| | (_| | ||  __/\__ \ 
-# |___|_| |_|___/\__\__,_|_|_|  \___/| .__/ \__,_|\__,_|\__\___||___/ 
-#                                    |_|                              
-# by Stephan Raabe (2024) 
-# ----------------------------------------------------- 
-# Required: yay trizen timeshift btrfs-grub
-# ----------------------------------------------------- 
-
-sleep 1
-clear
-figlet "Updates"
-echo
-_isInstalledYay() {
-    package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
-    if [ -n "${check}" ] ; then
-        echo 0; #'0' means 'true' in Bash
-        return; #true
-    fi;
-    echo 1; #'1' means 'false' in Bash
-    return; #false
-}
-
-# ------------------------------------------------------
-# Confirm Start
-# ------------------------------------------------------
-
-if gum confirm "DO YOU WANT TO START THE UPDATE NOW?" ;then
-    echo 
-    echo ":: Update started."
-elif [ $? -eq 130 ]; then
-        exit 130
-else
-    echo
-    echo ":: Update canceled."
-    exit;
-fi
-
-if [[ $(_isInstalledYay "timeshift") == "0" ]] ;then
-    if gum confirm "DO YOU WANT TO CREATE A SNAPSHOT?" ;then
-        echo
-        c=$(gum input --placeholder "Enter a comment for the snapshot...")
-        sudo timeshift --create --comments "$c"
-        sudo timeshift --list
-        sudo grub-mkconfig -o /boot/grub/grub.cfg
-        echo ":: DONE. Snapshot $c created!"
-        echo
-    elif [ $? -eq 130 ]; then
-        echo ":: Snapshot canceled."
-        exit 130
-    else
-        echo ":: Snapshot canceled."
-    fi
-    echo
-fi
-
-yay
-
-notify-send "Update complete"
-echo 
-echo ":: Update complete"
-sleep 2

scripts/onedrive.sh

@@ -1,12 +0,0 @@
-#   ___             ____       _            
-#  / _ \ _ __   ___|  _ \ _ __(_)_   _____  
-# | | | | '_ \ / _ \ | | | '__| \ \ / / _ \ 
-# | |_| | | | |  __/ |_| | |  | |\ V /  __/ 
-#  \___/|_| |_|\___|____/|_|  |_| \_/ \___| 
-#                                           
-#  
-# by Stephan Raabe (2023) 
-# ----------------------------------------------------- 
-
-rclone --vfs-cache-mode writes mount OneDrive: ~/OneDrive &
-notify-send "OneDrive connected" "Microsoft OneDrive successfully mounted."

scripts/snapshot.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-#  ____                        _           _    
-# / ___| _ __   __ _ _ __  ___| |__   ___ | |_  
-# \___ \| '_ \ / _` | '_ \/ __| '_ \ / _ \| __| 
-#  ___) | | | | (_| | |_) \__ \ | | | (_) | |_  
-# |____/|_| |_|\__,_| .__/|___/_| |_|\___/ \__| 
-#                   |_|                         
-#  
-# by Stephan Raabe (2024) 
-# ----------------------------------------------------- 
-
-sleep 1
-clear
-figlet "Snapshot"
-
-_isInstalledYay() {
-    package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
-    if [ -n "${check}" ] ; then
-        echo 0; #'0' means 'true' in Bash
-        return; #true
-    fi;
-    echo 1; #'1' means 'false' in Bash
-    return; #false
-}
-
-timeshift_installed=$(_isInstalledYay "timeshift")
-grubbtrfs_installed=$(_isInstalledYay "grub-btrfs")
-
-if [[ $timeshift_installed == "0" ]] ;then
-    c=$(gum input --placeholder "Enter a comment for the snapshot...")
-    sudo timeshift --create --comments "$c"
-    sudo timeshift --list
-    if [[ -d /boot/grub ]] ;then
-        if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "1" ]] ;then
-            if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then
-                yay -S grub-btrfs
-
-            else
-                exit
-            fi
-        fi
-        sudo grub-mkconfig -o /boot/grub/grub.cfg
-    fi
-    echo "DONE. Snapshot $c created!"
-else
-    echo "ERROR: Timeshift is not installed."
-    if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then
-        yay -S timeshift
-        echo 
-        echo ":: Timeshift has been installed. Please restart this script."
-        if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "1" ]] ;then
-            echo ":: grub-btrfs is required to select a snapshot on grub bootloader."
-            if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then
-                yay -S grub-btrfs
-            else
-                exit
-            fi
-        fi
-    fi
-fi

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"
@@ -101,8 +102,7 @@
         "return-type": "json",       
         "exec": "~/dotfiles/scripts/updates.sh",
         "restart-interval": 60,
-        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
+        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh"
-        "on-click-right": "~/dotfiles/.settings/software.sh"
     },
     
     // Wallpaper

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",
-
-    // 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
         "idle_inhibitor",
-        // END IDLE TOOGLE
+        "custom/separator#dot-line",
-        // START TRAY TOOGLE
+        "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
+        "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/modules.json

@@ -1,330 +1,708 @@
-//  __  __           _       _            
+//* ---- 💫 https://github.com/JaKooLit 💫 ---- *//
-// |  \/  | ___   __| |_   _| | ___  ___  
+/* Waybar Modules */
-// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| 
+
-// | |  | | (_) | (_| | |_| | |  __/\__ \ 
-// |_|  |_|\___/ \__,_|\__,_|_|\___||___/ 
-//                                        
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
 {
-    // Workspaces
+    // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs
-    "hyprland/workspaces" : {
+    // CIRCLES Style
-        "on-click": "activate",
+    "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": "<tt><small>{calendar}</small></tt>",
+        "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>"
+            }
+        }
+    },
+    "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": "<span style=\"italic\">  {}</span>", // 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} <i>{dynamic}</i>",
+        "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"
+            "wofi",
-        ],
+            "rofi",
-        "app_ids-mapping": {
+        ]
-            "firefoxdeveloperedition": "firefox-developer-edition"
-        },
-        "rewrite": {
-            "Firefox Web Browser": "Firefox",
-            "Foot Server": "Terminal"
-        }
     },
-
+    "custom/cycle_wall": {
-    // Hyprland Window
+        "format": " ",
-    "hyprland/window": {
+        "exec": "echo ; echo 󰸉 wallpaper select",
-        "rewrite": {
+        "on-click": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
-            "(.*) - Brave": "$1",
+        "on-click-right": "~/.config/hypr/UserScripts/WallpaperRandom.sh",
-            "(.*) - Chromium": "$1",
+        "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh",
-            "(.*) - Brave Search": "$1",
+        "interval": 86400, // once every day
-            "(.*) - Outlook": "$1",
+        "tooltip": true,
-            "(.*) Microsoft Teams": "$1"
-        },
-        "separate-outputs": true
     },
-
+    "custom/hint": {
-    // Cliphist
+        "format": "󰺁 HINT!",
-    "custom/cliphist": {
+        "exec": "echo ; echo  Key Hints SUPER H",
-        "format": "",
+        "on-click": "~/.config/hypr/scripts/KeyHints.sh",
-        "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh",
+        "interval": 86400, // once every day
-        "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d",
+        "tooltip": true,
-        "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w",
-        "tooltip": false
     },
-
+    "custom/keyboard": {
-    // Updates Count
+        "exec": "cat ~/.cache/kb_layout",
-    "custom/updates": {
+        "interval": 1,
-        "format": "  {}",
+        "format": " {}",
-        "tooltip-format": "{}",
+        "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
-        "escape": true,
-        "return-type": "json",       
-        "exec": "~/dotfiles/scripts/updates.sh",
-        "restart-interval": 60,
-        "on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh",
-        "tooltip": false
     },
-
+    "custom/light_dark": {
-    // Theme Starter Label
+        "format": "󰔎{}",
-    "custom/starter": {
+        "exec": "echo ; echo 󰔎 Dark-Light switcher",
-        "format": "THEME STARTER",
+        "on-click": "~/.config/hypr/scripts/DarkLight.sh",
-        "tooltip": false
+        "on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh",
+        "on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+        "interval": 86400, // once every day
+        "tooltip": true
     },
-    
+    "custom/lock": {
-    // Wallpaper
+        "format": "󰌾{}",
-    "custom/wallpaper": {
+        "exec": "echo ; echo 󰷛  screen lock",
-        "format": "",
+        "interval": 86400, // once every day
-        "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
+        "tooltip": true,
-        "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
+        "on-click": "~/.config/hypr/scripts/LockScreen.sh",
-        "tooltip": false
     },
-
+    "custom/menu": {
-    // Waybar Themes
+        "format": "{}",
-    "custom/waybarthemes": {
+        "exec": "echo ; echo 󱓟 app launcher",
-        "format": "",
+        "interval": 86400, // once every day
-        "on-click": "~/dotfiles/waybar/themeswitcher.sh",
+        "tooltip": true,
-        "tooltip": false
+        "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",
     },
-    
+    // This is a custom cava visualizer
-    // Settings
+    "custom/cava_mviz": {
-    "custom/settings": {
+        "exec": "~/.config/hypr/scripts/WaybarCava.sh",
-        "format": "",
+        "format": "{}"
-        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh",
-        "tooltip": false
     },
-
+    "custom/playerctl": {
-    // Keybindings
+        "format": "<span>{}</span>",
-    "custom/keybindings": {
+        "return-type": "json",
-        "format": "",
+        "max-length": 35,
-        "on-click": "~/dotfiles/hypr/scripts/keybindings.sh",
+        "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
-        "tooltip": false
+        "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,
     },
-
+    "custom/power": {
-    // Filemanager Launcher
+        "format": "⏻ ",
-    "custom/filemanager": {
+        "exec": "echo ; echo 󰟡 power // blur",
-        "format": "",
+        "on-click": "~/.config/hypr/scripts/Wlogout.sh",
-        "on-click": "thunar",
+        "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
-        "tooltip": false
+        "interval": 86400, // once every day
+        "tooltip": true,
     },
-
+    "custom/swaync": {
-    // Browser Launcher
+        "tooltip": true,
-    "custom/browser": {
+        "format": "{icon} {}",
-        "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}",
         "format-icons": {
-            "locked": "",
+            "notification": "<span foreground='red'><sup></sup></span>",
-            "unlocked": ""
+            "none": "",
-        }
+            "dnd-notification": "<span foreground='red'><sup></sup></span>",
+            "dnd-none": "",
+            "inhibited-notification": "<span foreground='red'><sup></sup></span>",
+            "inhibited-none": "",
+            "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
+            "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,
     },
-
+    // NOTE:! This is only for Arch and Arch Based Distros  depend: pacman-contrib
-    // System tray
+    "custom/updater": {
-    "tray": {
+        "format": " {}",
-        // "icon-size": 21,
+        "exec": "checkupdates | wc -l",
-        "spacing": 10
+        "exec-if": "[[ $(checkupdates | wc -l) ]]",
+        "interval": 15,
+        "on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
     },
-
+    "custom/weather": {
-    // Clock
+        "format": "{}",
-    "clock": {
+        "format-alt": "{alt}: {}",
-        // "timezone": "America/New_York",
+        "format-alt-click": "click",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "interval": 3600,
-        "format-alt": "{:%Y-%m-%d}"
+        "return-type": "json",
+        "exec": "~/.config/hypr/UserScripts/Weather.sh",
+        //"exec": "~/.config/hypr/UserScripts/Weather.py",
+        "exec-if": "ping wttr.in -c1",
+        "tooltip": true,
     },
-
+    // Separators
-    // System
+    "custom/separator#dot": {
-    "custom/system": {
+        "format": "",
-        "format": "",
+        "interval": "once",
         "tooltip": false
     },
-
+    "custom/separator#dot-line": {
-    // CPU
+        "format": "",
-    "cpu": {
+        "interval": "once",
-        "format": "/ C {usage}% ",
+        "tooltip": false
-        "on-click": "alacritty -e htop"
     },
-
+    "custom/separator#line": {
-    // Memory
+        "format": "|",
-    "memory": {
+        "interval": "once",
-        "format": "/ M {}% ",
+        "tooltip": false
-        "on-click": "alacritty -e htop"
     },
-
+    "custom/separator#blank": {
-    // Harddisc space used
+        "format": "",
-    "disk": {
+        "interval": "once",
-        "interval": 30,
+        "tooltip": false
-        "format": "D {percentage_used}% ",
-        "path": "/",
-        "on-click": "alacritty -e htop"
-    }, 
-
-    "hyprland/language": {
-        "format": "/ K {short}"
     },
-
+    "custom/separator#blank_2": {
-    // Group Hardware
+        "format": "  ",
-    "group/hardware": {
+        "interval": "once",
-        "orientation": "inherit",
+        "tooltip": false
-        "drawer": {
-            "transition-duration": 300,
-            "children-class": "not-memory",
-            "transition-left-to-right": false
-        },        
-        "modules": [
-            "custom/system",
-            "disk",
-            "cpu",
-            "memory",
-            "hyprland/language"
-        ]
     },
-    
+    "custom/separator#blank_3": {
-    // Group Settings
+        "format": "   ",
-    "group/settings": {
+        "interval": "once",
-        "orientation": "inherit",
+        "tooltip": false
-        "drawer": {
-            "transition-duration": 300,
-            "children-class": "not-memory",
-            "transition-left-to-right": false
-        },        
-        "modules": [
-            "custom/settings",
-            "custom/waybarthemes",
-            "custom/wallpaper"
-        ]
     },
-
+    // Modules below are for vertical layout
-    // Group Quicklinks
+    "backlight#vertical": {
-    "group/quicklinks": {
+        "interval": 2,
-        "orientation": "horizontal",
+        "align": 0.35,
-        "modules": [
+        "rotate": 1,
-            "custom/filemanager",
+        "format": "{icon}",
-            "custom/browser"
+        //"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}%",
     },
-
+    "clock#vertical": {
-    // Network
+        "format": "\n{:%H\n%M\n%S\n\n \n%d\n%m\n%y}",
-    "network": {
+        "interval": 1,
-        "format": "{ifname}",
+        //"format": "\n{:%I\n%M\n%p\n\n \n%d\n%m\n%y}",
-        "format-wifi": "   {signalStrength}%",
+        "tooltip": true,
-        "format-ethernet": "  {ipaddr}",
+        "tooltip-format": "{calendar}",
-        "format-disconnected": "Not connected", //An empty format will hide the module.
+        "calendar": {
-        "tooltip-format": " {ifname} via {gwaddri}",
+            "mode": "year",
-        "tooltip-format-wifi": "   {essid} ({signalStrength}%)",
+            "mode-mon-col": 3,
-        "tooltip-format-ethernet": "  {ifname} ({ipaddr}/{cidr})",
+            "format": {
-        "tooltip-format-disconnected": "Disconnected",
+                "today": "<span color='#0dbc79'>{}</span>",
-        "max-length": 50,
+            }
-        "on-click": "alacritty -e nmtui"
+        }
     },
-
+    "cpu#vertical": {
-    // Battery
+        "format": "󰍛\n{usage}%",
-    "battery": {
+        "interval": 1,
-        "states": {
+        "on-click-right": "gnome-system-monitor",
-            // "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": [" ", " ", " ", " ", " "]
     },
-
+    "memory#vertical": {
-    // Pulseaudio
+        "interval": 10,
-    "pulseaudio": {
+        "format": "󰾆\n{percentage}%",
-        // "scroll-step": 1, // %, can be a float
+        "format-alt": "󰾆\n{used:0.1f}G",
-        "format": "{icon} {volume}%",
+        "format-alt-click": "click",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "tooltip": true,
-        "format-bluetooth-muted": " {icon} {format_source}",
+        "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
-        "format-muted": " {format_source}",
+        "on-click-right": "kitty --title btop sh -c 'btop'",
-        "format-source": "{volume}% ",
+    },
-        "format-source-muted": "",
+    "pulseaudio#vertical": {
+        "format": "{icon}",
+        "format-bluetooth": "󰂰",
+        "format-muted": "󰖁",
         "format-icons": {
             "headphone": "",
-            "hands-free": "",
+            "hands-free": "",
-            "headset": "",
+            "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,
     },
-
+    "pulseaudio#microphone_vertical": {
-    // Bluetooth
+        "format": "{format_source}",
-    "bluetooth": {
+        "format-source": "󰍬",
-        "format-disabled": "",
+        "format-source-muted": "󰍭",
-        "format-off": "",
+        "on-click-right": "pavucontrol",
-        "interval": 30,
+        "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic",
-        "on-click": "blueman-manager",
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
-        "format-no-controller": ""
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
-    },
+        "max-volume": 100,
-
-    // Other
-    "user": {
-        "format": "{user}",
-        "interval": 60,
-        "icon": false,
-    },
-
-    // Idle Inhibator
-    "idle_inhibitor": {
-        "format": "{icon}",
         "tooltip": true,
-        "format-icons":{
+        "tooltip-format": "{source_desc} | {source_volume}%",
-            "activated": "",
+    },
-            "deactivated": ""
+    "temperature#vertical": {
-        },
+        "interval": 10,
-        "on-click-right": "hyprlock"        
+        "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,
+    },
+}

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;
- }
-
-
- #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;
     }
-}
+    
-
+    window#waybar {
-#battery.critical:not(.charging) {
+      transition-property: background-color;
-    background-color: #f53c3c;
+      transition-duration: 0.5s;
-    color: @textcolor3;
+      background: transparent;
-    animation-name: blink;
+      /*border: 2px solid @overlay0;*/
-    animation-duration: 0.5s;
+      /*background: @theme_base_color;*/
-    animation-timing-function: linear;
+      border-radius: 10px;
-    animation-iteration-count: infinite;
+    }
-    animation-direction: alternate;
+    
-}
+    window#waybar.hidden {
-
+      opacity: 0.2;
-/* -----------------------------------------------------
+    }
- * Tray
+    
- * ----------------------------------------------------- */
+    #waybar.empty #window {
-
+      background: none;
-#tray {
+    }
-    background-color: #2980b9;
+    
-}
+    /* This section can be use if you want to separate waybar modules */
-
+    .modules-left, .modules-center, .modules-right {
-#tray > .passive {
+        background: @theme_base_color; 
-    -gtk-icon-effect: dim;
+         border: 0.5px solid @overlay0;
-}
+        padding-top: 2px;
-
+        padding-bottom: 2px;
-#tray > .needs-attention {
+        padding-right: 4px;
-    -gtk-icon-effect: highlight;
+        padding-left: 4px;
-    background-color: #eb4d4b;
+        border-radius: 10px;
-}
+    
-
+    } 
-/* -----------------------------------------------------
+    
- * Other
+    .modules-left, .modules-right {
- * ----------------------------------------------------- */
+          border: 1px solid @blue;
-
+        padding-top: 2px;
-label:focus {
+        padding-bottom: 2px;
-    background-color: #000000;
+        padding-right: 4px;
-}
+        padding-left: 4px;
-
+    } 
-#backlight {
+    
-    background-color: #90b1b1;
+    #backlight,
-}
+    #backlight-slider,
-
+    #battery,
-#network {
+    #bluetooth,
-    background-color: #2980b9;
+    #clock,
-}
+    #cpu,
-
+    #disk,
-#network.disconnected {
+    #idle_inhibitor,
-    background-color: #f53c3c;
+    #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;
+    }

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