update: use kitty as main terminal

update: kitty config
update: add kitty and thunar to swallow
2024-07-20 01:27:14 -04:00 · 2024-07-20 01:26:40 -04:00 · 2024-07-20 01:20:13 -04:00 · 2024-07-03 11:57:32 -04:00 · 2024-06-17 04:20:29 -04:00 · 2024-06-15 23:08:33 -04:00
107 changed files with 1739 additions and 1391 deletions
@@ -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."
@@ -1,24 +0,0 @@
-# ------------------------------------------------------
-# Select fcitx5 or not
-# ------------------------------------------------------
-echo -e "${GREEN}"
-figlet "fcitx5"
-echo -e "${NONE}"
-
-if gum confirm "Do you want to install fcitx5 and chinese input method?" ;then
-    packagesPacman=(
-        "fcitx5"
-        "fcitx5-chinese-addons"
-        "fcitx5-configtool"
-        "fcitx5-gtk"
-        "fcitx5-qt"
-    );
-    packagesYay=(
-        "fcitx5-skin-seasons"
-    );
-    source .install/install-packages.sh
-    echo -e "\n# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
-    echo "# fcitx5 support" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
-    echo "# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
-    echo "source = ~/dotfiles/hypr/conf/fcitx5.conf" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
-fi
@@ -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,12 @@ 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
+    if [ ! -d ~/.local/share/icons ]; then mkdir -pv ~/.local/share/icons; fi
+    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors ~/.local/share/icons/
+fi
 echo ":: Symbolic links created."
 echo
@@ -1,65 +1,57 @@
 packagesPacman=(
    "pacman-contrib"
    "vim"
-    "bluez"
-    "bluez-utils"
+    "bat"
+    "fzf"
+    "zsh"
+    "fastfetch"
+    "ranger"
+    "btop"
    "neovim"
    "wget"
    "unzip"
    "alacritty"
-    "chromium" 
    "dunst"
    "starship"
    "mpv"
    "thunar"
    "nautilus"
-    "mousepad"
    "noto-fonts"
    "otf-font-awesome"
    "ttf-fira-sans"
    "ttf-fira-code"
    "ttf-firacode-nerd"
+    "ttf-firacode-nerd"
    "figlet"
    "vlc"
    "eza"
    "python-pip"
    "python-psutil"
    "python-rich"
-    "python-click" 
    "python-pywal"
-    "python-gobject"
    "pavucontrol"
    "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"
 );
@@ -9,9 +9,11 @@ packagesPacman=(
    "slurp"
    "swappy"
    "cliphist"
+    "kitty"
 );

 packagesYay=(
+    "pyprland"
    "wlogout"
    "nwg-look"
    "eww"
@@ -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."
@@ -5,16 +5,17 @@ echo -e "${GREEN}"
 figlet "Wallpapers"
 echo -e "${NONE}"
 if [ ! -d ~/wallpaper ]; then
-    echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
+    echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?"
    echo "If not, the script will install 3 default wallpapers in ~/wallpaper/"
    echo ""
    if gum confirm "Do you want to download the repository?" ;then
-        wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
-        unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
-        if [ ! -d ~/wallpaper/ ]; then
-            mkdir ~/wallpaper
-        fi
-        cp ~/Downloads/wallpaper-main/* ~/wallpaper/
+        # wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
+        # unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
+        # if [ ! -d ~/wallpaper/ ]; then
+        #     mkdir ~/wallpaper
+        # fi
+        # cp ~/Downloads/wallpaper-main/* ~/wallpaper/
+        git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/wallpaper
        echo "Wallpapers from the repository installed successfully."
    elif [ $? -eq 130 ]; then
        exit 130
@@ -1 +1 @@
-chromium
+google-chrome-stable
@@ -1 +1 @@
-mousepad
+~/dotfiles/.settings/terminal.sh -e vim
@@ -1 +0,0 @@
-nm-connection-editor
@@ -0,0 +1,3 @@
+* {
+    border-radius:  15px;
+}
@@ -1,4 +1,3 @@
 * {
    border-width:   2px;
-    border-radius:  15px;
 }
@@ -1 +0,0 @@
-alacritty -e pacseek
@@ -1 +1 @@
-alacritty
+kitty
@@ -0,0 +1,4 @@
+name = Extracted Theme
+description = Automatically extracted with hyprcursor-util
+version = 0.1
+cursors_directory = hyprcursors
@@ -9,5 +9,8 @@ style = "Regular"
 opacity = 0.7

 [window.padding]
-x = 15
-y = 15
+x = 0
+y = 0
+
+[selection]
+save_to_clipboard = true
@@ -0,0 +1 @@
+--ozone-platform=wayland --enable-wayland-ime
@@ -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",
-  "logo": {
-      "padding": {
-      "top": 2
-      }
-  },
+    // "logo": {
+    //     "type": "iterm",
+    //     "source": "/Users/carter/Desktop/apple1.png",
+    //     "width": 28,
+    //     "height": 12
+    // },
    "display": {
-        "separator": " ➜  "
+    //    "separator": "  "
+        "separator": " "
    },
    "modules": [
-      "break",
-      "break",
-      "break",
-       {
-          "type": "os",
-          "key": "OS   ",
-          "keyColor": "31",  // = color1
-      },
-      {
-          "type": "kernel",
-          "key": " ├  ",
-          "keyColor": "31",
-      },
-      {
-          "type": "packages",
-          "format": "{} (pacman)",
-          "key": " ├ 󰏖 ",
-          "keyColor": "31",  
-      },
-      {
-          "type": "shell",
-          "key": " └  ",
-          "keyColor": "31", 
-      },
-      "break",
-      {
-          "type": "wm",
-          "key": "WM   ",
-          "keyColor": "32", 
-      },
-      {
-          "type": "wmtheme",
-          "key": " ├ 󰉼 ",
-          "keyColor": "32",
-      },
-      {
-          "type": "icons",
-          "key": " ├ 󰀻 ",
-          "keyColor": "32",
-      },
-      {
-          "type": "cursor",
-          "key": " ├  ",
-          "keyColor": "32", 
-      },
-      {
-          "type": "terminal",
-          "key": " ├  ",
-          "keyColor": "32",
-      },
-      {
-          "type": "terminalfont",
-          "key": " └  ",
-          "keyColor": "32", 
-      },
-      "break",
        {
            "type": "host",
-          "format": "{5} {1} Type {2}",
-          "key": "PC   ",
-          "keyColor": "33",
+            "key": "╭─󰌢",
+            "keyColor": "green"
        },
        {
            "type": "cpu",
-          "format": "{1} ({3}) @ {7} GHz",
-          "key": " ├  ",
-          "keyColor": "33",
+            "key": "├─󰻠",
+            "keyColor": "green"
        },
        {
            "type": "gpu",
-          "format": "{1} {2} @ {12} GHz",            
-          "key": " ├ 󰢮 ",
-          "keyColor": "33",
-      },
-      {
-          "type": "memory",
-          "key": " ├  ",
-          "keyColor": "33",
-      },
-      {
-          "type": "swap",
-          "key": " ├ 󰓡 ",
-          "keyColor": "33",
+            "key": "├─󰍛",
+            "keyColor": "green"
        },
        {
            "type": "disk",
-          "key": " ├ 󰋊 ",
-          "keyColor": "33",
+            "key": "├─",
+            "keyColor": "green"
        },
        {
-          "type": "monitor",
-          "key": " └  ",
-          "keyColor": "33",
+            "type": "memory",
+            "key": "├─󰑭",
+            "keyColor": "green"
+        },
+        {
+            "type": "swap",
+            "key": "├─󰓡",
+            "keyColor": "green"
+        },
+        {
+            "type": "display",
+            "key": "├─󰍹",
+            "keyColor": "green"
+        },
+        {
+            "type": "battery",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "poweradapter",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "gamepad",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "bluetooth",
+            "key": "├─",
+            "keyColor": "green"
+        },
+        {
+            "type": "sound",
+            "key": "╰─",
+            "keyColor": "green"
        },
        "break",
+
+        {
+            "type": "shell",
+            "key": "╭─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "terminal",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "terminalfont",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "lm",
+            "key": "├─󰧨",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "de",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "wm",
+            "key": "├─",
+            "keyColor": "yellow"
+        },
+        {
+            "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󱓻"
+        }
    ]
 }
+
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/animation-moving.conf
+source = ~/dotfiles/hypr/conf/animations/animations-high.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
@@ -1 +1,2 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+exec-once = hyprctl setcursor Vimix-hyprcursors 24
+env = HYPRCURSOR_THEME,Vimix-hyprcursors
@@ -6,6 +6,7 @@
 env = XDG_SESSION_TYPE,wayland
 env = XDG_SESSION_DESKTOP,Hyprland
 env = QT_QPA_PLATFORM,wayland
+env = QT_QPA_PLATFORMTHEME,qt6ct
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = MOZ_ENABLE_WAYLAND,1
@@ -1,7 +0,0 @@
-exec-once = fcitx5-remote -r
-exec-once = fcitx5 -d --replace
-exec-once = fcitx5-remote -r
-
-bind=$mainMod CTRL, E, exec, pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r
-
-env=QT_IM_MODULE,fcitx
@@ -9,7 +9,7 @@ $mainMod = SUPER
 # Applications
 bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
 bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
-bind = $mainMod, period, exec, emote
+bind = $mainMod SHIFT, E, exec, emote

 # Windows
 bind = $mainMod, Q, killactive
@@ -35,15 +35,18 @@ bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
 bind = $mainMod CTRL, Q, exec, wlogout
 bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
 bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
-bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
+bind = $mainMod, SPACE, exec, rofi -show drun -replace -i
 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
 bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+bind = $mainMod CTRL, P, exec, hyprpicker -a
+bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
+bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh

 # Workspaces
 bind = $mainMod, 1, workspace, 1
@@ -92,3 +95,6 @@ bind = $mainMod, P, submap, passthru
 submap = passthru
 bind = SUPER, Escape, submap, reset
 submap = reset
+
+# Pyprland
+bind = $mainMod SHIFT, RETURN, exec, pypr toggle term
@@ -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 = true
+        disable_while_typing=true
+        tap-to-click=true
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
@@ -13,4 +13,11 @@ master {

 gestures {
  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
 }
@@ -5,4 +5,6 @@
 misc {
    disable_hyprland_logo = true
    disable_splash_rendering = true
+    enable_swallow = true
+    swallow_regex = ^(Alacritty|kitty|thunar)$
 }
@@ -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
@@ -16,3 +16,7 @@ layerrule = blur, logout_dialog

 windowrule = float,title=^(Mathematica)$
 windowrule = opacity 0.75, ^(Code)$
+windowrule = opacity 0.75, ^(code-url-handler)$
+windowrule = float,^(QQ)$
+windowrule = float,^(fdm)$
+windowrule = float,^(xdg-desktop-portal-gtk)$
@@ -0,0 +1,12 @@
+[pyprland]
+
+plugins = [
+  "scratchpads",
+  "magnify",
+]
+
+[scratchpads.term]
+animation = "fromTop"
+command = "alacritty --class kitty-dropterm"
+class = "alacritty-dropterm"
+size = "75% 60%"
@@ -29,7 +29,7 @@ gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
 gsettings set "$gnome_schema" font-name "$font_name"
 gsettings set "$gnome_schema" color-scheme "prefer-dark"

-if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
-    echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
-    hyprctl setcursor $cursor_theme $cursor_size
-fi
+# if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
+#     echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
+#     hyprctl setcursor $cursor_theme $cursor_size
+# fi
@@ -45,7 +45,6 @@ source .install/remove.sh
 source .install/general.sh
 source .install/packages/general-packages.sh
 source .install/install-packages.sh
-source .install/fcitx5.sh
 source .install/profile.sh
 if [[ $profile == *"Hyprland"* ]]; then
    echo -e "${GREEN}"
@@ -0,0 +1,25 @@
+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
+
+selection_foreground #000000
+selection_background #F5FBFF
+
+detect_urls    yes
+copy_on_select clipboard
+strip_trailing_spaces smart
+rectangle_select_modifiers ctrl+alt
+terminal_select_modifiers shift
+
+enable_audio_bell no
+
+remember_window_size no
+window_padding_width 5
+
+map ctrl+super+enter    launch --cwd=current
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -39,6 +39,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -38,6 +38,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -33,6 +33,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -39,6 +39,7 @@ configuration {

 /* ---- Load border width ---- */
@import "~/dotfiles/.settings/rofi-border.rasi"
+@import "~/dotfiles/.settings/rofi-border-radius.rasi"

 /* ---- Window ---- */
 window {
@@ -1 +0,0 @@
-thunar
@@ -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
@@ -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
@@ -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."
@@ -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
@@ -35,7 +35,8 @@
        "on-click": "activate",
        "on-click-middle": "close",
        "ignore-list": [
-           "Alacritty"
+           "Alacritty",
+           "alacritty-dropterm"
        ],
        "app_ids-mapping": {
            "firefoxdeveloperedition": "firefox-developer-edition"
@@ -103,8 +104,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-right": "~/dotfiles/.settings/software.sh"
+        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh"
    },
    
    // Wallpaper
@@ -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';
@@ -1,73 +1,70 @@
-// __        __          _                 
-// \ \      / /_ _ _   _| |__   __ _ _ __  
-//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
-//   \ V  V / (_| | |_| | |_) | (_| | |    
-//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
-//                 |___/                   
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Top -Laptop ### //
 {
-    // General Settings
-
-    // Position TOP
+    "include": "~/dotfiles/waybar/themes/custom/modules.json",
    "layer": "top",
-    "margin-bottom": 0,
+    //"mode": "dock",
+    "exclusive": true,
+    "passthrough": false,
+    "position": "top",
+    "spacing": 3,
+    "fixed-center": true,
+    "ipc": true,
+    "margin-top": 3,
+    "margin-left": 8,
+    "margin-right": 8,

-    // Position BOTTOM
-    // "position": "bottom",
-    // "margin-top": 0,
-    // "margin-bottom": 14,
-    
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,    
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/themes/custom/modules.json"],
-
-    // Modules Left
    "modules-left": [
-        "custom/appmenu",
-        "custom/settings",
-        "custom/waybarthemes",
-        "custom/wallpaper",
-        // START TASK TOOGLE
-        // "wlr/taskbar",
-        // END TASK TOOGLE
-        "group/quicklinks",
-        "hyprland/window",
-        "custom/starter"
+        "hyprland/workspaces#pacman",
+        "custom/separator#dot-line",
+        "cpu",
+        "custom/separator#dot-line",
+        "temperature",
+        "custom/separator#dot-line",
+        "memory",
+        "custom/separator#dot-line",
+        "custom/weather",
+        "custom/separator#blank_3",
+        "custom/cava_mviz",
        ],

-    // Modules Center
    "modules-center": [
-        "hyprland/workspaces"
+        "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",
-        "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
-        // START TRAY TOOGLE
+        "network#speed",
+        "custom/separator#dot-line",
+        "custom/swaync",
        "tray",
-        // END TRAY TOOGLE
-        "custom/exit",
-        "custom/ml4w-welcome",
-        "clock"
-    ]
+        "mpris",
+        "custom/separator#dot-line",
+        "bluetooth",
+        "custom/separator#dot-line",
+        "battery",
+        "custom/separator#dot-line",
+        "backlight",
+        "custom/separator#dot-line",
+        "pulseaudio",
+        "custom/separator#dot-line",
+        "pulseaudio#microphone",
+        "custom/separator#dot-line",
+        "keyboard-state",
+        "custom/separator#dot-line",
+        "custom/keyboard",
+        "custom/separator#dot-line",
+        "custom/power",
+        ],
    }
@@ -1,330 +1,708 @@
-//  __  __           _       _            
-// |  \/  | ___   __| |_   _| | ___  ___  
-// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| 
-// | |  | | (_) | (_| | |_| | |  __/\__ \ 
-// |_|  |_|\___/ \__,_|\__,_|_|\___||___/ 
-//                                        
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
+//* ---- 💫 https://github.com/JaKooLit 💫 ---- *//
+/* Waybar Modules */
+
 {
-    // Workspaces
+    // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs
+    // CIRCLES Style
    "hyprland/workspaces": {
-        "on-click": "activate",
        "active-only": false,
        "all-outputs": true,
-        "format": "{}",
-        "format-icons": {
-			"urgent": "",
-			"active": "",
-			"default": ""
-        },
-        "persistent-workspaces": {
-             "*": 5
-        }       
-    },
-
-    // Taskbar
-    "wlr/taskbar": {
        "format": "{icon}",
-        "icon-size": 18,
-        "tooltip-format": "{title}",
+        "show-special": false,
        "on-click": "activate",
-        "on-click-middle": "close",
-        "ignore-list": [
-           "Alacritty"
-        ],
-        "app_ids-mapping": {
-            "firefoxdeveloperedition": "firefox-developer-edition"
+        "on-scroll-up": "hyprctl dispatch workspace e+1",
+        "on-scroll-down": "hyprctl dispatch workspace e-1",
+        "persistent-workspaces": {
+            "1": [],
+            "2": [],
+            "3": [],
+            "4": [],
+            "5": [],
        },
-        "rewrite": {
-            "Firefox Web Browser": "Firefox",
-            "Foot Server": "Terminal"
-        }
-    },
-
-    // Hyprland Window
-    "hyprland/window": {
-        "rewrite": {
-            "(.*) - Brave": "$1",
-            "(.*) - Chromium": "$1",
-            "(.*) - Brave Search": "$1",
-            "(.*) - Outlook": "$1",
-            "(.*) Microsoft Teams": "$1"
-        },
-        "separate-outputs": true
-    },
-
-    // Cliphist
-    "custom/cliphist": {
-        "format": "",
-        "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh",
-        "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d",
-        "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w",
-        "tooltip": false
-    },
-
-    // Updates Count
-    "custom/updates": {
-        "format": "  {}",
-        "tooltip-format": "{}",
-        "escape": true,
-        "return-type": "json",       
-        "exec": "~/dotfiles/scripts/updates.sh",
-        "restart-interval": 60,
-        "on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh",
-        "tooltip": false
-    },
-
-    // Theme Starter Label
-    "custom/starter": {
-        "format": "THEME STARTER",
-        "tooltip": false
-    },
-    
-    // Wallpaper
-    "custom/wallpaper": {
-        "format": "",
-        "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
-        "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
-        "tooltip": false
-    },
-
-    // Waybar Themes
-    "custom/waybarthemes": {
-        "format": "",
-        "on-click": "~/dotfiles/waybar/themeswitcher.sh",
-        "tooltip": false
-    },
-    
-    // Settings
-    "custom/settings": {
-        "format": "",
-        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh",
-        "tooltip": false
-    },
-
-    // Keybindings
-    "custom/keybindings": {
-        "format": "",
-        "on-click": "~/dotfiles/hypr/scripts/keybindings.sh",
-        "tooltip": false
-    },
-
-    // Filemanager Launcher
-    "custom/filemanager": {
-        "format": "",
-        "on-click": "thunar",
-        "tooltip": false
-    },
-
-    // Browser Launcher
-    "custom/browser": {
-        "format": "",
-        "on-click": "~/dotfiles/.settings/browser.sh",
-        "tooltip": false
-    },    
-
-    // ML4W Welcome App
-    "custom/ml4w-welcome": {
-        "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
-        "format": " ",
-        "tooltip": false
-    },
-
-    // ChatGPT Launcher
-    "custom/chatgpt": {
-        "format": "",
-        "on-click": "chromium --app=https://chat.openai.com",
-        "tooltip": false
-    },
-
-    // Rofi Application Launcher
-    "custom/appmenu": {
-        "format": "Apps",
-        "on-click": "rofi -show drun -replace",
-        "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
-        "tooltip": false
-    },
-    
-    // Power Menu
-    "custom/exit": {
-        "format": "",
-        "on-click": "wlogout",
-        "tooltip": false
-    },
-
-    // Keyboard State
-    "keyboard-state": {
-        "numlock": true,
-        "capslock": true,
-        "format": "{name} {icon}",
        "format-icons": {
-            "locked": "",
-            "unlocked": ""
+            "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": "十",
        }
    },
-
-    // System tray
-    "tray": {
-        // "icon-size": 21,
-        "spacing": 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": "",
        },
-
-    // Clock
-    "clock": {
-        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
    },
-
-    // System
-    "custom/system": {
-        "format": "",
-        "tooltip": false
-    },
-
-    // CPU
-    "cpu": {
-        "format": "/ C {usage}% ",
-        "on-click": "alacritty -e htop"
-    },
-
-    // Memory
-    "memory": {
-        "format": "/ M {}% ",
-        "on-click": "alacritty -e htop"
-    },
-
-    // Harddisc space used
-    "disk": {
-        "interval": 30,
-        "format": "D {percentage_used}% ",
-        "path": "/",
-        "on-click": "alacritty -e htop"
-    }, 
-
-    "hyprland/language": {
-        "format": "/ K {short}"
-    },
-
-    // Group Hardware
-    "group/hardware": {
-        "orientation": "inherit",
-        "drawer": {
-            "transition-duration": 300,
-            "children-class": "not-memory",
-            "transition-left-to-right": false
-        },        
-        "modules": [
-            "custom/system",
-            "disk",
-            "cpu",
-            "memory",
-            "hyprland/language"
-        ]
-    },
-    
-    // Group Settings
-    "group/settings": {
-        "orientation": "inherit",
-        "drawer": {
-            "transition-duration": 300,
-            "children-class": "not-memory",
-            "transition-left-to-right": false
-        },        
-        "modules": [
-            "custom/settings",
-            "custom/waybarthemes",
-            "custom/wallpaper"
-        ]
-    },
-
-    // Group Quicklinks
-    "group/quicklinks": {
+    // GROUP
+    "group/motherboard": {
        "orientation": "horizontal",
        "modules": [
-            "custom/filemanager",
-            "custom/browser"
+            "cpu",
+            "memory",
+            "temperature",
+            "disk",
        ]
    },
-
-    // Network
-    "network": {
-        "format": "{ifname}",
-        "format-wifi": "   {signalStrength}%",
-        "format-ethernet": "  {ipaddr}",
-        "format-disconnected": "Not connected", //An empty format will hide the module.
-        "tooltip-format": " {ifname} via {gwaddri}",
-        "tooltip-format-wifi": "   {essid} ({signalStrength}%)",
-        "tooltip-format-ethernet": "  {ifname} ({ipaddr}/{cidr})",
-        "tooltip-format-disconnected": "Disconnected",
-        "max-length": 50,
-        "on-click": "alacritty -e nmtui"
+    "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
    "battery": {
+        //"interval": 5,
+        "align": 0,
+        "rotate": 0,
+        //"bat": "BAT1",
+        //"adapter": "ACAD",
+        "full-at": 100,
+        "design-capacity": false,
        "states": {
-            // "good": 95,
+            "good": 95,
            "warning": 30,
            "critical": 15
        },
        "format": "{icon} {capacity}%",
-        "format-charging": "  {capacity}%",
-        "format-plugged": "  {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": "󱘖 {capacity}%",
+        "format-alt-click": "click",
+        "format-full": "{icon} Full",
        "format-alt": "{icon} {time}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": [" ", " ", " ", " ", " "]
+        "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
    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
        "format": "{icon} {volume}%",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": " {format_source}",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
+        "format-bluetooth": "{icon} 󰂰 {volume}%",
+        "format-muted": "󰖁",
        "format-icons": {
            "headphone": "",
-            "hands-free": "",
-            "headset": "",
+            "hands-free": "",
+            "headset": "",
            "phone": "",
            "portable": "",
            "car": "",
-            "default": ["", " ", " "]
+            "default": [
+                "", "", "󰕾",  ""
+            ],
+            "ignored-sinks": [
+                "Easy Effects Sink"
+            ],
        },
-        "on-click": "pavucontrol"
+        "scroll-step": 5.0,
+        "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
+        "on-click-right": "pavucontrol -t 3",
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+        "tooltip-format": "{icon} {desc} | {volume}%",
+        "smooth-scrolling-threshold": 1,
    },
-
-    // Bluetooth
-    "bluetooth": {
-        "format-disabled": "",
-        "format-off": "",
-        "interval": 30,
-        "on-click": "blueman-manager",
-        "format-no-controller": ""
+    "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,
    },
-
-    // Other
-    "user": {
-        "format": "{user}",
-        "interval": 60,
-        "icon": false,
-    },
-
-    // Idle Inhibator
-    "idle_inhibitor": {
-        "format": "{icon}",
+    "temperature": {
+        "interval": 10,
        "tooltip": true,
-        "format-icons":{
-            "activated": "",
-            "deactivated": ""
+        "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'"
    },
-        "on-click-right": "hyprlock"        
+    "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": [
+            "wofi",
+            "rofi",
+        ]
+    },
+    "custom/cycle_wall": {
+        "format": " ",
+        "exec": "echo ; echo 󰸉 wallpaper select",
+        "on-click": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+        "on-click-right": "~/.config/hypr/UserScripts/WallpaperRandom.sh",
+        "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh",
+        "interval": 86400, // once every day
+        "tooltip": true,
+    },
+    "custom/hint": {
+        "format": "󰺁 HINT!",
+        "exec": "echo ; echo  Key Hints SUPER H",
+        "on-click": "~/.config/hypr/scripts/KeyHints.sh",
+        "interval": 86400, // once every day
+        "tooltip": true,
+    },
+    "custom/keyboard": {
+        "exec": "cat ~/.cache/kb_layout",
+        "interval": 1,
+        "format": " {}",
+        "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
+    },
+    "custom/light_dark": {
+        "format": "󰔎{}",
+        "exec": "echo ; echo 󰔎 Dark-Light switcher",
+        "on-click": "~/.config/hypr/scripts/DarkLight.sh",
+        "on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh",
+        "on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+        "interval": 86400, // once every day
+        "tooltip": true
+    },
+    "custom/lock": {
+        "format": "󰌾{}",
+        "exec": "echo ; echo 󰷛  screen lock",
+        "interval": 86400, // once every day
+        "tooltip": true,
+        "on-click": "~/.config/hypr/scripts/LockScreen.sh",
+    },
+    "custom/menu": {
+        "format": "{}",
+        "exec": "echo ; echo 󱓟 app launcher",
+        "interval": 86400, // once every day
+        "tooltip": true,
+        "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window",
+        "on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+        "on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh",
+    },
+    // This is a custom cava visualizer
+    "custom/cava_mviz": {
+        "exec": "~/.config/hypr/scripts/WaybarCava.sh",
+        "format": "{}"
+    },
+    "custom/playerctl": {
+        "format": "<span>{}</span>",
+        "return-type": "json",
+        "max-length": 35,
+        "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
+        "on-click-middle": "playerctl play-pause",
+        "on-click": "playerctl previous",
+        "on-click-right": "playerctl next",
+        "scroll-step": 5.0,
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+        "smooth-scrolling-threshold": 1,
+    },
+    "custom/power": {
+        "format": "⏻ ",
+        "exec": "echo ; echo 󰟡 power // blur",
+        "on-click": "~/.config/hypr/scripts/Wlogout.sh",
+        "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
+        "interval": 86400, // once every day
+        "tooltip": true,
+    },
+    "custom/swaync": {
+        "tooltip": true,
+        "format": "{icon} {}",
+        "format-icons": {
+            "notification": "<span foreground='red'><sup></sup></span>",
+            "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
+    "custom/updater": {
+        "format": " {}",
+        "exec": "checkupdates | wc -l",
+        "exec-if": "[[ $(checkupdates | wc -l) ]]",
+        "interval": 15,
+        "on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
+    },
+    "custom/weather": {
+        "format": "{}",
+        "format-alt": "{alt}: {}",
+        "format-alt-click": "click",
+        "interval": 3600,
+        "return-type": "json",
+        "exec": "~/.config/hypr/UserScripts/Weather.sh",
+        //"exec": "~/.config/hypr/UserScripts/Weather.py",
+        "exec-if": "ping wttr.in -c1",
+        "tooltip": true,
+    },
+    // Separators
+    "custom/separator#dot": {
+        "format": "",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#dot-line": {
+        "format": "",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#line": {
+        "format": "|",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#blank": {
+        "format": "",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#blank_2": {
+        "format": "  ",
+        "interval": "once",
+        "tooltip": false
+    },
+    "custom/separator#blank_3": {
+        "format": "   ",
+        "interval": "once",
+        "tooltip": false
+    },
+    // Modules below are for vertical layout
+    "backlight#vertical": {
+        "interval": 2,
+        "align": 0.35,
+        "rotate": 1,
+        "format": "{icon}",
+        //"format-icons": ["󰃞", "󰃟", "󰃠"],
+        "format-icons": [
+            "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""
+        ],
+        "on-click": "",
+        "on-click-middle": "",
+        "on-click-right": "",
+        "on-update": "",
+        "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
+        "smooth-scrolling-threshold": 1,
+        "tooltip-format": "{percent}%",
+    },
+    "clock#vertical": {
+        "format": "\n{:%H\n%M\n%S\n\n \n%d\n%m\n%y}",
+        "interval": 1,
+        //"format": "\n{:%I\n%M\n%p\n\n \n%d\n%m\n%y}",
+        "tooltip": true,
+        "tooltip-format": "{calendar}",
+        "calendar": {
+            "mode": "year",
+            "mode-mon-col": 3,
+            "format": {
+                "today": "<span color='#0dbc79'>{}</span>",
            }
        }
+    },
+    "cpu#vertical": {
+        "format": "󰍛\n{usage}%",
+        "interval": 1,
+        "on-click-right": "gnome-system-monitor",
+    },
+    "memory#vertical": {
+        "interval": 10,
+        "format": "󰾆\n{percentage}%",
+        "format-alt": "󰾆\n{used:0.1f}G",
+        "format-alt-click": "click",
+        "tooltip": true,
+        "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
+        "on-click-right": "kitty --title btop sh -c 'btop'",
+    },
+    "pulseaudio#vertical": {
+        "format": "{icon}",
+        "format-bluetooth": "󰂰",
+        "format-muted": "󰖁",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": [
+                "", "", "󰕾", ""
+            ],
+            "tooltip-format": "{icon} {desc} | {volume}%",
+            "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_vertical": {
+        "format": "{format_source}",
+        "format-source": "󰍬",
+        "format-source-muted": "󰍭",
+        "on-click-right": "pavucontrol",
+        "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic",
+        "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
+        "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
+        "max-volume": 100,
+        "tooltip": true,
+        "tooltip-format": "{source_desc} | {source_volume}%",
+    },
+    "temperature#vertical": {
+        "interval": 10,
+        "tooltip": true,
+        "hwmon-path": [
+            "/sys/class/hwmon/hwmon1/temp1_input",
+            "/sys/class/thermal/thermal_zone0/temp"
+        ],
+        //"thermal-zone": 0,
+        "critical-threshold": 80,
+        "format-critical": "{icon}\n{temperatureC}°C",
+        "format": " {icon}",
+        "format-icons": [
+            "󰈸"
+        ],
+        "on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+    },
+    "custom/power_vertical": {
+        "format": "⏻",
+        "exec": "echo ; echo 󰟡 power // blur",
+        "on-click": "~/.config/hypr/scripts/Wlogout.sh",
+        "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
+        "interval": 86400, // once every day
+        "tooltip": true,
+    },
+}
@@ -1,430 +1,314 @@
-/*
- * __        __          _                  ____  _         _       
- * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
- *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
- *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
- *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
- *                 |___/                              |___/         
- *  
- * by Stephan Raabe (2023) 
- * ----------------------------------------------------- 
-*/
-
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-/* @import 'style-light.css'; */
-/* @define-color backgroundlight #FFFFFF;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 #CCCCCC;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #000000;
-@define-color textcolor2 #000000;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF; */
-
-/* -----------------------------------------------------
- * General 
- * ----------------------------------------------------- */
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Catppuccin Mocha */

 * {
-    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    border: none;
-    border-radius: 0px;
+    font-family: "JetBrainsMono Nerd Font";
+    font-weight: bold;
+    min-height: 0;
+    /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+    font-size: 97%;
+    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+    padding: 1px;
    }
    
    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;
-    font-size: 16px;
-    color: @textcolor1;
-}
-
-#workspaces button {
-    padding: 0px 5px;
-    margin: 4px 3px;
-    border-radius: 15px;
-    border: 0px;
-    color: @textcolor3;
-    transition: all 0.3s ease-in-out;
-}
-
-#workspaces button.active {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-    border-radius: 15px;
-    min-width: 40px;
-    transition: all 0.3s ease-in-out;
-}
-
-#workspaces button:hover {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-    border-radius: 15px;
-}
-
-/* -----------------------------------------------------
- * Tooltips
- * ----------------------------------------------------- */
-
-tooltip {
+      transition-duration: 0.5s;
+      background: transparent;
+      /*border: 2px solid @overlay0;*/
+      /*background: @theme_base_color;*/
      border-radius: 10px;
-    background-color: @backgroundlight;
-    opacity:0.8;
-    padding:20px;
-    margin:0px;
    }
    
-tooltip label {
-    color: @textcolor2;
+    window#waybar.hidden {
+      opacity: 0.2;
    }
    
-/* -----------------------------------------------------
- * 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;
+    #waybar.empty #window {
+      background: none;
    }
    
-window#waybar.empty #window {
-    background-color:transparent;
+    /* 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;
+    
    } 
    
-/* -----------------------------------------------------
- * Taskbar
- * ----------------------------------------------------- */
-
-#taskbar {
-    background: @backgroundlight;
-    margin: 6px 15px 6px 0px;
-    padding:0px;
-    border-radius: 15px;
-    font-weight: normal;
-    font-style: normal;
-    border: 3px solid @backgroundlight;
+    .modules-left, .modules-right {
+          border: 1px solid @blue;
+        padding-top: 2px;
+        padding-bottom: 2px;
+        padding-right: 4px;
+        padding-left: 4px;
    } 
    
-#taskbar button {
-    margin:0;
-    border-radius: 15px;
-    padding: 0px 5px 0px 5px;
+    #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;
    }
    
-/* -----------------------------------------------------
- * 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;
+      color: @blue;
    }
    
-#idle_inhibitor.activated {
-    margin-right: 15px;
-    font-size: 20px;
-    font-weight: bold;
-    opacity: 0.8;
-    color: #dc2f2f;
+    #bluetooth,
+    #backlight {
+      color: @blue;
    }
    
-/* -----------------------------------------------------
- * 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;
+      color: @green;
    }
    
    @keyframes blink {
      to {
-        background-color: @backgroundlight;
-        color: @textcolor2;
+        color: @surface0;
      }
    }
    
    #battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: @textcolor3;
+      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;
    }
    
-/* -----------------------------------------------------
- * Tray
- * ----------------------------------------------------- */
+    #clock {
+      color: @yellow;
+    }
    
-#tray {
-    background-color: #2980b9;
+    #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;
-    background-color: #eb4d4b;
    }
    
-/* -----------------------------------------------------
- * Other
- * ----------------------------------------------------- */
-
-label:focus {
-    background-color: #000000;
+    #keyboard-state {
+      color: @flamingo;
    }
    
-#backlight {
-    background-color: #90b1b1;
+    #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 {
-    background-color: #2980b9;
+      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;
    }
    
-#network.disconnected {
-    background-color: #f53c3c;
+    #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;
+    }
@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="MEOW Blur Colored"
@@ -8,9 +8,9 @@
@define-color workspacesbackground1 @color5;
@define-color workspacesbackground2 @color11;
@define-color bordercolor @color11;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
+@define-color textcolor1 @foreground;
+@define-color textcolor2 @foreground;
+@define-color textcolor3 @foreground;
+@define-color iconcolor @foreground;

@import '../style.css';
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wyj	a3c7f5814b	update: use kitty as main terminal	2024-07-20 01:27:14 -04:00
wyj	1c17d73231	update: kitty config	2024-07-20 01:26:40 -04:00
wyj	4666c1c133	update: add kitty and thunar to swallow	2024-07-20 01:20:13 -04:00
wyj	73dbcd426c	feat: add qt6ct QT theme	2024-07-03 11:57:32 -04:00
wyj	fe545d9d30	update: add noto cjk font, make sure cjk font works	2024-06-17 04:20:29 -04:00
wyj	ef44c3b7ff	update: make xdg-desktop-portal-gtk float	2024-06-15 23:08:33 -04:00
wyj	164e56e0b1	Merge branch 'upstream-main' into upstream-custom	2024-06-13 21:27:01 -04:00
wyj	0120c08205	update: use Vimix-hyprcursors instead	2024-06-12 23:20:42 -04:00
wyj	e1801c20cb	fix: link of vimix hyprcursor	2024-06-10 18:05:07 -04:00
wyj	8fb376e095	update: float fdm	2024-06-09 20:29:06 -04:00
wyj	34cda567b3	update: add tray on sencond display	2024-06-09 20:23:15 -04:00
wyj	d1036c31c6	update: split my waybar theme as standalone meow-blur	2024-06-09 13:38:26 -04:00
wyj	b156843244	fix: also set opacity for wayland vscode	2024-06-09 13:24:27 -04:00
wyj	d2d71fef55	fix: disable use cursors from gtk, so hyprcursors will be used	2024-06-09 13:21:27 -04:00
wyj	bc97bf2569	update: change some keybings	2024-06-07 01:51:20 -04:00
wyj	7e2f972430	update: add vimix cursor and orchis theme	2024-06-06 01:02:38 -04:00
wyj	3ba0df7b7c	update: more cleanup	2024-06-06 00:57:18 -04:00
wyj	a23d8a5c38	update: remove the fucking unused packages	2024-06-06 00:35:28 -04:00
wyj	6cd8154bab	update: Vimix hyprcursors	2024-06-05 23:20:28 -04:00
wyj	3bc6335304	update: get my laptop layout back	2024-06-05 05:56:08 -04:00
wyj	ac677d9bb9	Merge branch 'upstream-main' into upstream-custom	2024-06-05 05:50:17 -04:00
wyj	245ab326fd	update: use drawer to have idle_inhibiner	2024-06-04 16:52:29 -04:00
wyj	5326446dd7	fix: typo: ture->true	2024-05-28 16:19:42 -04:00
wyj	827adc2140	update: add DP-2 in waybar	2024-05-28 15:12:43 -04:00
wyj	d890fad373	feat: add window swallow	2024-05-28 02:19:29 -04:00
wyj	604242d58d	fix: change workspace button style order	2024-05-27 03:37:38 -04:00
wyj	a479750bd7	update: add laptop touchpad and gestures	2024-05-26 19:21:50 -04:00
wyj	08947e991c	update: battery icon and space	2024-05-26 18:47:31 -04:00
wyj	3ca359ce96	fix: add kitty config	2024-05-26 18:41:55 -04:00
wyj	8a05e91018	update: add ttf-firacode-nerd	2024-05-26 18:24:11 -04:00
wyj	43e564e47a	update: waybar	2024-05-26 18:22:25 -04:00
wyj	6cf2a43c2c	update: waybar	2024-05-26 02:54:26 -04:00
wyj	2a3b26adb7	update: add main monitor settings to dual	2024-05-26 01:59:26 -04:00
wyj	d01229183c	fix: kitty-dropterm	2024-05-26 01:44:50 -04:00
wyj	20643e9048	update: change default animation	2024-05-26 01:30:03 -04:00
wyj	e01895d286	update: use us keyboad layout	2024-05-26 01:11:33 -04:00
wyj	985b12cc6e	update: wazbar	2024-05-26 00:50:57 -04:00
wyj	24f4e6e424	update: use kitty as drop-down term	2024-05-25 14:46:40 -04:00
wyj	dd8866242e	fix: add pyprland to packages	2024-05-23 19:00:19 -04:00
wyj	8fc4cb9d9e	feat: add pyprland and term dropdown	2024-05-23 03:18:10 -04:00
wyj	73d4480014	feat: add chrome-flags.conf	2024-05-23 01:35:44 -04:00
wyj	efb387ef14	update: change wallpapers to my own	2024-05-22 00:19:43 -04:00
wyj	3e99847d8b	update: copy a waybar config	2024-05-22 00:12:43 -04:00
wyj	c1542e026c	update: new colors in fastfetch	2024-05-21 19:16:39 -04:00
wyj	dd5a4b76ae	update: float QQ	2024-05-17 13:14:19 -04:00
wyj	3a49bd1ad7	update: use fastfetch instead of neofetch	2024-05-10 17:05:12 -04:00
wyj	075a5df837	enhence: add fastfetch config	2024-05-10 17:02:55 -04:00
wyj	6500fe1c1a	enhence: add display selection in screenshot	2024-05-07 23:45:52 -04:00
wyj	77b6b90448	Merge branch 'upstream-main' into upstream-custom	2024-05-05 16:40:17 -04:00
wyj	149d10a285	update: add some custom packages	2024-04-19 14:43:23 -04:00
wyj	fd46e16738	update: make alacritty auto copy	2024-04-19 02:48:51 -04:00
wyj	f68578bc48	update: idle... margin in waybar	2024-04-15 19:53:17 -04:00
wyj	d46e796571	update: waybar ram icon	2024-04-15 13:17:46 -04:00
wyj	14a56275eb	update: wifi icon in waybar	2024-04-09 14:16:04 -04:00
wyj	26654d87e9	fix: rofi border radius	2024-04-05 16:20:36 -04:00
				`@@ -0,0 +1 @@`
				`--ozone-platform=wayland --enable-wayland-ime`