update: add QT_IM_MODULE=fcitx env

Merge branch 'upstream-main' into fcitx5
2024-06-16 01:57:22 -04:00 · 2024-06-13 21:28:51 -04:00 · 2024-06-05 05:50:50 -04:00 · 2024-04-05 16:13:19 -04:00 · 2024-04-05 16:07:36 -04:00 · 2024-04-05 15:50:00 -04:00
106 changed files with 1403 additions and 1738 deletions
@@ -13,6 +13,24 @@ 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."
@@ -0,0 +1,24 @@
+# ------------------------------------------------------
+# 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,9 +5,6 @@
 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
@@ -46,12 +43,5 @@ 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,57 +1,65 @@
 packagesPacman=(
    "pacman-contrib"
    "vim"
-    "bat"
-    "fzf"
-    "zsh"
-    "fastfetch"
-    "ranger"
-    "btop"
+    "bluez"
+    "bluez-utils"
    "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=(
-    "vimix-cursors"
-    "orchis-theme"
+    "bibata-cursor-theme" 
    "trizen"
-    "google-chrome"
+    "pacseek"
 );
@@ -9,11 +9,9 @@ packagesPacman=(
    "slurp"
    "swappy"
    "cliphist"
-    "kitty"
 );

 packagesYay=(
-    "pyprland"
    "wlogout"
    "nwg-look"
    "eww"
@@ -35,7 +35,4 @@ 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,17 +5,16 @@ echo -e "${GREEN}"
 figlet "Wallpapers"
 echo -e "${NONE}"
 if [ ! -d ~/wallpaper ]; then
-    echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?"
+    echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
    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/
-        git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/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/
        echo "Wallpapers from the repository installed successfully."
    elif [ $? -eq 130 ]; then
        exit 130
@@ -1 +1 @@
-google-chrome-stable
+chromium
@@ -1 +1 @@
-~/dotfiles/.settings/terminal.sh -e vim
+mousepad
@@ -0,0 +1 @@
+nm-connection-editor
@@ -1,3 +0,0 @@
-* {
-    border-radius:  15px;
-}
@@ -1,3 +1,4 @@
 * {
    border-width:   2px;
+    border-radius:  15px;
 }
@@ -0,0 +1 @@
+alacritty -e pacseek
@@ -1,4 +0,0 @@
-name = Extracted Theme
-description = Automatically extracted with hyprcursor-util
-version = 0.1
-cursors_directory = hyprcursors
@@ -11,6 +11,3 @@ opacity = 0.7
 [window.padding]
 x = 15
 y = 15
-
-[selection]
-save_to_clipboard = true
@@ -1 +0,0 @@
--ozone-platform=wayland --enable-wayland-ime
@@ -1,165 +1,110 @@
-// Note that you must replace the image path to an existing image to display it.
-
+//  Thanks to Bina
 {
  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    // "logo": {
-    //     "type": "iterm",
-    //     "source": "/Users/carter/Desktop/apple1.png",
-    //     "width": 28,
-    //     "height": 12
-    // },
+  "logo": {
+      "padding": {
+      "top": 2
+      }
+  },
  "display": {
-    //    "separator": "  "
-        "separator": " "
+        "separator": " ➜  "
  },
  "modules": [
-        {
-            "type": "host",
-            "key": "╭─󰌢",
-            "keyColor": "green"
-        },
-        {
-            "type": "cpu",
-            "key": "├─󰻠",
-            "keyColor": "green"
-        },
-        {
-            "type": "gpu",
-            "key": "├─󰍛",
-            "keyColor": "green"
-        },
-        {
-            "type": "disk",
-            "key": "├─",
-            "keyColor": "green"
-        },
-        {
-            "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"
-        },
+      "break",
       {
          "type": "os",
-            "key": "├─󰣇", // Just get your distro's logo off nerdfonts.com
-            "keyColor": "blue"
+          "key": "OS   ",
+          "keyColor": "31",  // = color1
      },
      {
          "type": "kernel",
-            "key": "├─",
-            "format": "{1} {2}",
-            "keyColor": "blue"
+          "key": " ├  ",
+          "keyColor": "31",
      },
      {
          "type": "packages",
-            "key": "├─󰏖",
-            "keyColor": "blue"
+          "format": "{} (pacman)",
+          "key": " ├ 󰏖 ",
+          "keyColor": "31",  
      },
      {
-            "type": "uptime",
-            "key": "├─󰅐",
-            "keyColor": "blue"
-        },
-        {
-            "type": "media",
-            "key": "├─󰝚",
-            "keyColor": "blue"
-        },
-        {
-            "type": "localip",
-            "key": "╰─󰩟",
-            "compact": true,
-            "keyColor": "blue"
+          "type": "shell",
+          "key": " └  ",
+          "keyColor": "31", 
      },
      "break",
      {
-            "type": "custom",
-            "format": " \u001b[90m󱓻  \u001b[31m󱓻  \u001b[32m󱓻  \u001b[33m󱓻  \u001b[34m󱓻  \u001b[35m󱓻  \u001b[36m󱓻  \u001b[37m󱓻  \u001b[38m󱓻  \u001b[39m󱓻"
-        }
+          "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",
+      },
+      {
+          "type": "cpu",
+          "format": "{1} ({3}) @ {7} GHz",
+          "key": " ├  ",
+          "keyColor": "33",
+      },
+      {
+          "type": "gpu",
+          "format": "{1} {2} @ {12} GHz",            
+          "key": " ├ 󰢮 ",
+          "keyColor": "33",
+      },
+      {
+          "type": "memory",
+          "key": " ├  ",
+          "keyColor": "33",
+      },
+      {
+          "type": "swap",
+          "key": " ├ 󰓡 ",
+          "keyColor": "33",
+      },
+      {
+          "type": "disk",
+          "key": " ├ 󰋊 ",
+          "keyColor": "33",
+      },
+      {
+          "type": "monitor",
+          "key": " └  ",
+          "keyColor": "33",
+      },
+      "break",
+      "break",
  ]
 }
-
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/animations-high.conf
+source = ~/dotfiles/hypr/conf/animations/animation-moving.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,2 +1 @@
-exec-once = hyprctl setcursor Vimix-hyprcursors 24
-env = HYPRCURSOR_THEME,Vimix-hyprcursors
+exec-once = hyprctl setcursor Bibata-Modern-Ice 24
@@ -6,7 +6,6 @@
 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
@@ -0,0 +1,7 @@
+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 SHIFT, E, exec, emote
+bind = $mainMod, period, exec, emote

 # Windows
 bind = $mainMod, Q, killactive
@@ -35,18 +35,15 @@ 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, SPACE, exec, rofi -show drun -replace -i
+bind = $mainMod CTRL, RETURN, 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
@@ -95,6 +92,3 @@ 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 = us
+    kb_layout = de
    kb_variant = 
    kb_model =
    kb_options =
@@ -11,9 +11,7 @@ input {
    follow_mouse = 1
    mouse_refocus=false
    touchpad {
-        natural_scroll = true
-        disable_while_typing=true
-        tap-to-click=true
+        natural_scroll = false
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
@@ -13,11 +13,4 @@ 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,6 +5,4 @@
 misc {
    disable_hyprland_logo = true
    disable_splash_rendering = true
-    enable_swallow = true
-    swallow_regex = ^(Alacritty|kitty|thunar)$
 }
@@ -4,7 +4,4 @@
 # ----------------------------------------------------- 

 monitor=DP-1,preferred,0x0,2
-monitor=HDMI-A-1,3840x2160,1920x-275,2,transform,1
-
-workspace=1,monitor:DP-1
-exec-once=hyprctl dispatch workspace 1
+monitor=HDMI-A-1,3840x2160,1920x-180,2,transform,1
@@ -16,7 +16,3 @@ 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)$
@@ -1,12 +0,0 @@
-[pyprland]
-
-plugins = [
-  "scratchpads",
-  "magnify",
-]
-
-[scratchpads.term]
-animation = "fromTop"
-command = "kitty --class kitty-dropterm"
-class = "kitty-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,6 +45,7 @@ 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}"
@@ -1,14 +0,0 @@
-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
@@ -38,7 +38,6 @@ configuration {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 /* ---- Window ---- */
 window {
@@ -0,0 +1 @@
+thunar
@@ -0,0 +1,42 @@
+#!/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
@@ -0,0 +1,66 @@
+#!/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
@@ -0,0 +1,12 @@
+#   ___             ____       _            
+#  / _ \ _ __   ___|  _ \ _ __(_)_   _____  
+# | | | | '_ \ / _ \ | | | '__| \ \ / / _ \ 
+# | |_| | | | |  __/ |_| | |  | |\ V /  __/ 
+#  \___/|_| |_|\___|____/|_|  |_| \_/ \___| 
+#                                           
+#  
+# by Stephan Raabe (2023) 
+# ----------------------------------------------------- 
+
+rclone --vfs-cache-mode writes mount OneDrive: ~/OneDrive &
+notify-send "OneDrive connected" "Microsoft OneDrive successfully mounted."
@@ -0,0 +1,61 @@
+#!/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,8 +35,7 @@
        "on-click": "activate",
        "on-click-middle": "close",
        "ignore-list": [
-           "Alacritty",
-           "alacritty-dropterm"
+           "Alacritty"
        ],
        "app_ids-mapping": {
            "firefoxdeveloperedition": "firefox-developer-edition"
@@ -104,7 +103,8 @@
        "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
@@ -13,35 +13,4 @@
 @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,70 +1,73 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-
-// ### DEFAULT Top -Laptop ### //
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
 {
-    "include": "~/dotfiles/waybar/themes/custom/modules.json",
+    // General Settings
+
+    // Position TOP
    "layer": "top",
-    //"mode": "dock",
-    "exclusive": true,
-    "passthrough": false,
-    "position": "top",
-    "spacing": 3,
-    "fixed-center": true,
-    "ipc": true,
-    "margin-top": 3,
-    "margin-left": 8,
-    "margin-right": 8,
+    "margin-bottom": 0,

+    // 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": [
-        "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",
+        "custom/appmenu",
+        "custom/settings",
+        "custom/waybarthemes",
+        "custom/wallpaper",
+        // START TASK TOOGLE
+        // "wlr/taskbar",
+        // END TASK TOOGLE
+        "group/quicklinks",
+        "hyprland/window",
+        "custom/starter"
    ],

+    // Modules Center
    "modules-center": [
-        "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",
+        "hyprland/workspaces"
    ],

+    // Modules Right    
    "modules-right": [
-        "network#speed",
-        "custom/separator#dot-line",
-        "custom/swaync",
-        "tray",
-        "mpris",
-        "custom/separator#dot-line",
-        "bluetooth",
-        "custom/separator#dot-line",
-        "battery",
-        "custom/separator#dot-line",
-        "backlight",
-        "custom/separator#dot-line",
+        "custom/updates",
        "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",
-        ],
+        // 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
+        "tray",
+        // END TRAY TOOGLE
+        "custom/exit",
+        "custom/ml4w-welcome",
+        "clock"
+    ]
 }
@@ -1,314 +1,430 @@
-/* ---- 💫 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: "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;
+    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    border: none;
+    border-radius: 0px;
 }

 window#waybar {
+    background-color: rgba(0,0,0,0.2);
+    border-bottom: 0px solid #ffffff;
+    /* color: #FFFFFF; */
    transition-property: background-color;
-      transition-duration: 0.5s;
-      background: transparent;
-      /*border: 2px solid @overlay0;*/
-      /*background: @theme_base_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 {
    border-radius: 10px;
+    background-color: @backgroundlight;
+    opacity:0.8;
+    padding:20px;
+    margin:0px;
 }

-    window#waybar.hidden {
-      opacity: 0.2;
+tooltip label {
+    color: @textcolor2;
 }

-    #waybar.empty #window {
-      background: none;
+/* -----------------------------------------------------
+ * 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;
 }

-    /* 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;
-    
+window#waybar.empty #window {
+    background-color:transparent;
 }

-    .modules-left, .modules-right {
-          border: 1px solid @blue;
-        padding-top: 2px;
-        padding-bottom: 2px;
-        padding-right: 4px;
-        padding-left: 4px;
+/* -----------------------------------------------------
+ * Taskbar
+ * ----------------------------------------------------- */
+
+#taskbar {
+    background: @backgroundlight;
+    margin: 6px 15px 6px 0px;
+    padding:0px;
+    border-radius: 15px;
+    font-weight: normal;
+    font-style: normal;
+    border: 3px solid @backgroundlight;
 }

-    #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;
+#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 {
-      color: @blue;
+    margin-right: 15px;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: @iconcolor;
 }

-    #bluetooth,
-    #backlight {
-      color: @blue;
+#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 {
-      color: @green;
+    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 {
-        color: @surface0;
+        background-color: @backgroundlight;
+        color: @textcolor2;
    }
 }

 #battery.critical:not(.charging) {
-      background-color: @red;
-      color: @theme_text_color;
+    background-color: #f53c3c;
+    color: @textcolor3;
    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;
-    }
+/* -----------------------------------------------------
+ * Tray
+ * ----------------------------------------------------- */

-    #cpu {
-      color: @green;
-    }
-    
-    #custom-keyboard,
-    #memory {
-      color: @sky;
-    }
-    
-    #disk {
-      color: @sapphire;
-    }
-    
-    #temperature {
-      color: @teal;
-    }
-    
-    #temperature.critical {
-      background-color: @red;
+#tray {
+    background-color: #2980b9;
 }

 #tray > .passive {
    -gtk-icon-effect: dim;
 }
+
 #tray > .needs-attention {
    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
 }

-    #keyboard-state {
-      color: @flamingo;
+/* -----------------------------------------------------
+ * Other
+ * ----------------------------------------------------- */
+
+label:focus {
+    background-color: #000000;
 }

-    #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;
+#backlight {
+    background-color: #90b1b1;
 }

 #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;
+    background-color: #2980b9;
 }

-    #pulseaudio-slider trough {
-        min-width: 80px;
-        min-height: 5px;
-        border-radius: 5px;
+#network.disconnected {
+    background-color: #f53c3c;
 }

-    #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;
-    }
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="MEOW Blur Colored"
@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Custom Colored"
@@ -8,9 +8,9 @@
@define-color workspacesbackground1 @color5;
@define-color workspacesbackground2 @color11;
@define-color bordercolor @color11;
-@define-color textcolor1 @foreground;
-@define-color textcolor2 @foreground;
-@define-color textcolor3 @foreground;
-@define-color iconcolor @foreground;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;

@import '../style.css';
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wyj	7692ad3c41	update: add QT_IM_MODULE=fcitx env	2024-06-16 01:57:22 -04:00
wyj	d3277bd7fc	Merge branch 'upstream-main' into fcitx5	2024-06-13 21:28:51 -04:00
wyj	c2d2d45546	Merge branch 'upstream-main' into fcitx5	2024-06-05 05:50:50 -04:00
wyj	b9025fbfb1	fix: fcitx5 conf	2024-04-05 16:13:19 -04:00
wyj	7a4d9f7b21	fix: fcitx5 conf	2024-04-05 16:07:36 -04:00
wyj	249e71d187	fix: fcitx5 conf	2024-04-05 15:50:00 -04:00
wyj	380b43ea30	new feat: fcitx5 install	2024-04-05 15:31:21 -04:00
				`@@ -1 +0,0 @@`
				`--ozone-platform=wayland --enable-wayland-ime`