update: add QT_IM_MODULE=fcitx env

Merge branch 'upstream-main' into fcitx5
Updates
2024-06-16 01:57:22 -04:00 · 2024-06-13 21:28:51 -04:00 · 2024-06-12 13:02:08 +02:00 · 2024-06-12 13:00:40 +02:00 · 2024-06-12 12:32:03 +02:00 · 2024-06-12 10:20:13 +02:00
52 changed files with 1270 additions and 1783 deletions
@@ -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
@@ -40,14 +37,11 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
    _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/swappy ]; then
+if [ -d ~/dotfiles-versions/$version/eww ]; then
    _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config
 fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
 fi
-if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then
-    _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
-fi
 echo ":: Symbolic links created."
 echo
@@ -1,12 +1,6 @@
 packagesPacman=(
    "pacman-contrib"
    "vim"
-    "bat"
-    "fzf"
-    "zsh"
-    "fastfetch"
-    "ranger"
-    "btop"
    "bluez"
    "bluez-utils"
    "neovim"
@@ -23,8 +17,7 @@ packagesPacman=(
    "noto-fonts" 
    "otf-font-awesome" 
    "ttf-fira-sans" 
-    "ttf-fira-code"
-    "ttf-firacode-nerd"
+    "ttf-fira-code" 
    "ttf-firacode-nerd" 
    "figlet" 
    "vlc" 
@@ -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."
@@ -8,7 +8,7 @@ input {
    kb_model =
    kb_options =
    numlock_by_default = true
-    mouse_refocus=false
+    mouse_refocus = false
    
    # For United States
    # kb_layout = us
@@ -28,3 +28,7 @@ input {
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
+
+gestures {
+    workspace_swipe = true
+}
@@ -8,7 +8,7 @@ input {
    kb_model =
    kb_options =
    numlock_by_default = true
-    mouse_refocus=false
+    mouse_refocus = false
    
    # For United States
    # kb_layout = us
@@ -22,9 +22,14 @@ input {
        # natural_scroll = false

        # for laptop
-        natural_scroll = yes
+        natural_scroll = true
        middle_button_emulation = true
-        clickfinger_behavior = 1  
+        clickfinger_behavior = true
+        disable_while_typing = true
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
+
+gestures {
+    workspace_swipe = true
+}
@@ -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,3 +0,0 @@
-* {
-    border-radius:  15px;
-}
@@ -1,3 +1,4 @@
 * {
    border-width:   2px;
+    border-radius:  15px;
 }
@@ -1 +1 @@
-2.9.1.1
+2.9.1.2
@@ -1 +1 @@
-2911
+2912
@@ -1,3 +1,11 @@
+Version 2.9.1.2
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
+--------------------------------------------------------
+- Workspaces module in waybar updated to enable scroll to change the workspace https://gitlab.com/stephan-raabe/dotfiles/-/merge_requests/114
+- More functions deactivated in Game Mode (SUPER+ALT+G)
+- Keybindings rofi menu updated with keybinding description. Open with right mouse click on Apps waybar module
+- Fixed bug of ML4W Hyprland Settings App with Hyprland 0.41.0
+
 Version 2.9.1.1
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
 --------------------------------------------------------
@@ -1,4 +1,4 @@
-# ML4W Dotfiles 2.9.1.1
+# ML4W Dotfiles 2.9.1.2

 An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.

@@ -55,6 +55,8 @@ THANK YOU very much for all your support, contributions and ideas:
 - Don Williams: https://github.com/dwilliam62
 - Teodor Orzechowski: https://gitlab.com/sq6gtt
 - Jamie Deppeler: https://gitlab.com/bknight2k
+- Yingjie Wang: https://gitlab.com/GaugeAndGravity
+- Daniel Gerber: https://gitlab.com/dan.john.gerber
 - https://gitlab.com/muee

 and many more...
@@ -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
-    // },
-    "display": {
-    //    "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"
-        },
-        {
-            "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󱓻"
-        }
-    ]
-}
-
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "logo": {
+      "padding": {
+      "top": 2
+      }
+  },
+  "display": {
+        "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",
+      },
+      {
+          "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,9 +29,6 @@ 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

@@ -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
@@ -92,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
@@ -7,90 +7,88 @@
 $mainMod = SUPER

 # Applications
-bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
-bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
+bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh # Open the terminal
+bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh # Open the browser
+bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh # Open the filemanager

 # Windows
-bind = $mainMod, Q, killactive
-bind = $mainMod, F, fullscreen
-bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
-bind = $mainMod, T, togglefloating
-bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
-bind = $mainMod, J, togglesplit
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-bind = $mainMod SHIFT, right, resizeactive, 100 0
-bind = $mainMod SHIFT, left, resizeactive, -100 0
-bind = $mainMod SHIFT, up, resizeactive, 0 -100
-bind = $mainMod SHIFT, down, resizeactive, 0 100
-bind = $mainMod, G, togglegroup
+bind = $mainMod, Q, killactive # Kill active window
+bind = $mainMod, F, fullscreen # Set active window to fullscreen
+bind = $mainMod, T, togglefloating # Toggle active windows into floating mode
+bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh # Toggle all windows into floating mode
+bind = $mainMod, J, togglesplit # Toggle split
+bind = $mainMod, left, movefocus, l # Move focus left
+bind = $mainMod, right, movefocus, r # Move focus right
+bind = $mainMod, up, movefocus, u # Move focus up
+bind = $mainMod, down, movefocus, d # Move focus down
+bindm = $mainMod, mouse:272, movewindow # Move window with the mouse
+bindm = $mainMod, mouse:273, resizewindow # Resize window with the mouse
+bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard
+bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard
+bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard
+bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard
+bind = $mainMod, G, togglegroup # Toggle window group

 # Actions
-bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh
-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 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
+bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh # Toggle animations
+bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh # Take a screenshot
+bind = $mainMod CTRL, Q, exec, wlogout # Start wlogout
+bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh # Change the wallpaper
+bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select # Open wallpaper selector
+bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i # Open application launcher
+bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh # Show keybindings
+bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh # Reload waybar
+bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh # Toggle waybar
+bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh # Reload hyprland config
+bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh # Open clipboard manager
+bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh # Open waybar theme switcher
+bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
+bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh # Toggle screenshader
+bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh # Toggle game mode

 # Workspaces
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-bind = $mainMod CTRL, down, workspace, empty
-
-# Fn keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
-bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
-bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
-bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bind = , XF86AudioPlay, exec, playerctl play-pause
-bind = , XF86AudioPause, exec, playerctl pause
-bind = , XF86AudioNext, exec, playerctl next
-bind = , XF86AudioPrev, exec, playerctl previous
-bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bind = , XF86Calculator, exec, qalculate-gtk
-bind = , XF86Lock, exec, hyprlock
-bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh
+bind = $mainMod, 1, workspace, 1 # Open workspace 1
+bind = $mainMod, 2, workspace, 2 # Open workspace 2
+bind = $mainMod, 3, workspace, 3 # Open workspace 3
+bind = $mainMod, 4, workspace, 4 # Open workspace 4
+bind = $mainMod, 5, workspace, 5 # Open workspace 5
+bind = $mainMod, 6, workspace, 6 # Open workspace 6
+bind = $mainMod, 7, workspace, 7 # Open workspace 7
+bind = $mainMod, 8, workspace, 8 # Open workspace 8
+bind = $mainMod, 9, workspace, 9 # Open workspace 9
+bind = $mainMod, 0, workspace, 10 # Open workspace 10
+bind = $mainMod SHIFT, 1, movetoworkspace, 1 # Move active window to workspace 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2 # Move active window to workspace 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3 # Move active window to workspace 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4 # Move active window to workspace 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5 # Move active window to workspace 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6 # Move active window to workspace 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7 # Move active window to workspace 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8 # Move active window to workspace 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9 # Move active window to workspace 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Move active window to workspace 10
+bind = $mainMod, mouse_down, workspace, e+1 # Open next workspace
+bind = $mainMod, mouse_up, workspace, e-1 # Open previous workspace
+bind = $mainMod CTRL, down, workspace, empty # Open the next empty workspace

 # Passthrough SUPER KEY to Virtual Machine
-bind = $mainMod, P, submap, passthru
+bind = $mainMod, P, submap, passthru # Passthrough SUPER key to virtual machine
 submap = passthru
-bind = SUPER, Escape, submap, reset
+bind = SUPER, Escape, submap, reset # Get SUPER key back from virtual machine
 submap = reset
+
+# Fn keys
+bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% # Increase brightness by 10%
+bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- # Reduce brightness by 10%
+bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% # Increase volume by 5%
+bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% # Reduce volume by 5%
+bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle # Toggle mute
+bind = , XF86AudioPlay, exec, playerctl play-pause # Audio play pause
+bind = , XF86AudioPause, exec, playerctl pause # Audio pause
+bind = , XF86AudioNext, exec, playerctl next # Audio next
+bind = , XF86AudioPrev, exec, playerctl previous # Audio previous
+bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle # Toggle microphone
+bind = , XF86Calculator, exec, qalculate-gtk # Open calculator
+bind = , XF86Lock, exec, hyprlock # Open screenlock
+bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
+
@@ -3,17 +3,15 @@
 # https://wiki.hyprland.org/Configuring/Variables/#input
 # -----------------------------------------------------
 input {
-    kb_layout = us
-    kb_variant =
+    kb_layout = de
+    kb_variant = 
    kb_model =
    kb_options =
    numlock_by_default = true
    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.
 }
@@ -5,6 +5,4 @@
 misc {
    disable_hyprland_logo = true
    disable_splash_rendering = true
-    enable_swallow = true
-    swallow_regex = ^(Alacritty)$
 }
@@ -22,9 +22,9 @@ windowrulev2 = float,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = size 400 500,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = move 10% 20%,class:(ml4w-dotfiles-settings.py)

-windowrulev2 = float,class:(com.ml4w.hyprlandsettings)
-windowrulev2 = size 700 600,class:(com.ml4w.hyprlandsettings)
-windowrulev2 = center,class:(com.ml4w.hyprlandsettings)
+windowrulev2 = float,class:(com.ml4w.hyprland.settings)
+windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
+windowrulev2 = center,class:(com.ml4w.hyprland.settings)

 windowrulev2 = float,class:(ml4w-hyprland-settings.py)
 windowrulev2 = size 700 600,class:(ml4w-hyprland-settings.py)
@@ -37,4 +37,3 @@ windowrulev2 = center,class:(dotfiles-floating)
 env = APPIMAGELAUNCHER_DISABLE,1
 env = XCURSOR_SIZE,24
 env = XDG_CURRENT_DESKTOP,Hyprland
-
@@ -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,4 +16,3 @@ layerrule = blur, logout_dialog

 windowrule = float,title=^(Mathematica)$
 windowrule = opacity 0.75, ^(Code)$
-windowrule = float,^(QQ)$
@@ -1,12 +0,0 @@
-[pyprland]
-
-plugins = [
-  "scratchpads",
-  "magnify",
-]
-
-[scratchpads.term]
-animation = "fromTop"
-command = "kitty --class kitty-dropterm"
-class = "kitty-dropterm"
-size = "75% 60%"
@@ -7,13 +7,18 @@
 #

 if [ -f ~/.cache/gamemode ] ;then
-    hyprctl keyword animations:enabled true
-    hyprctl keyword decoration:blur:enabled true
+    hyprctl reload
    rm ~/.cache/gamemode
    notify-send "Gamemode deactivated" "Animations and blur enabled"
 else
-    hyprctl keyword animations:enabled false
-    hyprctl keyword decoration:blur:enabled false
-    touch ~/.cache/gamemode
+    hyprctl --batch "\
+        keyword animations:enabled 0;\
+        keyword decoration:drop_shadow 0;\
+        keyword decoration:blur:enabled 0;\
+        keyword general:gaps_in 0;\
+        keyword general:gaps_out 0;\
+        keyword general:border_size 1;\
+        keyword decoration:rounding 0"
+	touch ~/.cache/gamemode
    notify-send "Gamemode activated" "Animations and blur disabled"
 fi
@@ -21,13 +21,29 @@ config_file=${config_file/source=~/}
 config_file="/home/$USER$config_file"
 echo "Reading from: $config_file"

-# ----------------------------------------------------- 
-# Parse keybindings
-# ----------------------------------------------------- 
-keybinds=$(grep -oP '(?<=bind = ).*' $config_file)
-keybinds=$(echo "$keybinds" | sed 's/$mainMod/SUPER/g'| sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g')
-# ----------------------------------------------------- 
-# Show keybindings in rofi
-# ----------------------------------------------------- 
+keybinds=""
+
+# Detect Start String
+while read -r line
+do
+    if [[ "$line" == "bind"* ]]; then
+
+        line="$(echo "$line" | sed 's/$mainMod/SUPER/g')"
+        line="$(echo "$line" | sed 's/bind = //g')"
+        line="$(echo "$line" | sed 's/bindm = //g')"
+
+        IFS='#' 
+        read -a strarr <<<"$line" 
+        kb_str=${strarr[0]}
+        cm_str=${strarr[1]}
+
+        IFS=',' 
+        read -a kbarr <<<"$kb_str" 
+
+        item="${kbarr[0]}  + ${kbarr[1]}"$'\r'"${cm_str:1}"
+        keybinds=$keybinds$item$'\n'
+    fi 
+done < "$config_file"
+
 sleep 0.2
-rofi -dmenu -i -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
+rofi -dmenu -i -markup -eh 2 -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
@@ -42,4 +42,4 @@ case $choice in
        notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
        swappy -f "$DIR$NAME"
    ;;
-esac
+esac
@@ -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
@@ -31,3 +31,13 @@ set ttyfast                 " Speed up scrolling in Vim
 " set spell                 " enable spell check (may need to download language package)
 " set noswapfile            " disable creating swap file
 " set backupdir=~/.cache/vim " Directory to store backup files.
+
+hi NonText ctermbg=none guibg=NONE
+hi Normal guibg=NONE ctermbg=NONE
+hi NormalNC guibg=NONE ctermbg=NONE
+hi SignColumn ctermbg=NONE ctermfg=NONE guibg=NONE
+
+hi Pmenu ctermbg=NONE ctermfg=NONE guibg=NONE
+hi FloatBorder ctermbg=NONE ctermfg=NONE guibg=NONE
+hi NormalFloat ctermbg=NONE ctermfg=NONE guibg=NONE
+hi TabLine ctermbg=None ctermfg=None guibg=None
@@ -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 {
@@ -153,11 +152,12 @@ listview {
    spacing:                      10px;
    padding:                      10px;
    margin:                       0px;
-    fixed-height:                true;
-    fixed-columns:               true;
+    fixed-height:                 true;
+    fixed-columns:                true;
    background-color:             @background;
    border:                       0px;
    border-radius:                0px;
+    flow:                         horizontal;      
 }

 /* ---- Element ---- */
@@ -39,7 +39,6 @@ configuration {

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

 /* ---- Window ---- */
 window {
@@ -11,6 +11,8 @@
 {
    // Workspaces
    "hyprland/workspaces" : {
+        "on-scroll-up": "hyprctl dispatch workspace r-1",
+        "on-scroll-down": "hyprctl dispatch workspace r+1",        
        "on-click": "activate",
        "active-only": false,
        "all-outputs": true,
@@ -33,8 +35,7 @@
        "on-click": "activate",
        "on-click-middle": "close",
        "ignore-list": [
-           "Alacritty",
-           "alacritty-dropterm"
+           "Alacritty"
        ],
        "app_ids-mapping": {
            "firefoxdeveloperedition": "firefox-developer-edition"
@@ -139,14 +140,14 @@
    "custom/filemanager": {
        "format": "",
        "on-click": "~/dotfiles/.settings/filemanager.sh",
-        "tooltip-format": "Open the filemanager"
+        "tooltip-format": "Open filemanager"
    },

    // Browser Launcher
    "custom/browser": {
        "format": "",
        "on-click": "~/dotfiles/.settings/browser.sh",
-        "tooltip-format": "Open the browser"
+        "tooltip-format": "Open browser"
    },    

    // ChatGPT Launcher
@@ -160,7 +161,7 @@
    "custom/calculator": {
        "format": "",
        "on-click": "qalculate-gtk",
-        "tooltip": false
+        "tooltip-format": "Open calculator"
    },

    // Windows VM
@@ -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-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    border: none;
+    border-radius: 0px;
+}
+
+window#waybar {
+    background-color: rgba(0,0,0,0.2);
+    border-bottom: 0px solid #ffffff;
+    /* color: #FFFFFF; */
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+/* -----------------------------------------------------
+ * Workspaces 
+ * ----------------------------------------------------- */
+
+#workspaces {
+    margin: 5px 1px 6px 1px;
+    padding: 0px 1px;
+    border-radius: 15px;
+    border: 0px;
    font-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-style: normal;
+    font-size: 16px;
+    color: @textcolor1;
+}
+
+#workspaces button {
+    padding: 0px 5px;
+    margin: 4px 3px;
+    border-radius: 15px;
+    border: 0px;
+    color: @textcolor3;
+    transition: all 0.3s ease-in-out;
+}
+
+#workspaces button.active {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+    min-width: 40px;
+    transition: all 0.3s ease-in-out;
+}
+
+#workspaces button:hover {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+}
+
+/* -----------------------------------------------------
+ * Tooltips
+ * ----------------------------------------------------- */
+
+tooltip {
+    border-radius: 10px;
+    background-color: @backgroundlight;
+    opacity:0.8;
+    padding:20px;
+    margin:0px;
+}
+
+tooltip label {
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Window
+ * ----------------------------------------------------- */
+
+#window {
+    background: @backgroundlight;
+    margin: 10px 15px 10px 0px;
+    padding: 2px 10px 0px 10px;
+    border-radius: 12px;
+    color:@textcolor2;
+    font-size:16px;
+    font-weight:normal;
+}
+
+window#waybar.empty #window {
+    background-color:transparent;
+}
+
+/* -----------------------------------------------------
+ * Taskbar
+ * ----------------------------------------------------- */
+
+#taskbar {
+    background: @backgroundlight;
+    margin: 6px 15px 6px 0px;
+    padding:0px;
+    border-radius: 15px;
+    font-weight: normal;
+    font-style: normal;
+    border: 3px solid @backgroundlight;
+}
+
+#taskbar button {
+    margin:0;
+    border-radius: 15px;
+    padding: 0px 5px 0px 5px;
+}
+
+/* -----------------------------------------------------
+ * Modules
+ * ----------------------------------------------------- */
+
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+/* -----------------------------------------------------
+ * Custom Quicklinks
+ * ----------------------------------------------------- */
+
+#custom-brave, 
+#custom-browser, 
+#custom-keybindings, 
+#custom-outlook, 
+#custom-filemanager, 
+#custom-teams, 
+#custom-chatgpt, 
+#custom-calculator, 
+#custom-windowsvm, 
+#custom-cliphist, 
+#custom-wallpaper, 
+#custom-settings, 
+#custom-wallpaper, 
+#custom-system,
+#custom-waybarthemes {
+    margin-right: 23px;
+    font-size: 20px;
+    font-weight: bold;
+    color: @iconcolor;
+}
+ 
+ #custom-waybarthemes,#custom-system {
+     margin-right:15px;
+ }
+
+
+ #custom-ml4w-welcome {
+    margin-right: 15px;
+    background-image: url("../assets/ml4w-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+/* -----------------------------------------------------
+ * Idle Inhibator
+ * ----------------------------------------------------- */
+
+ #idle_inhibitor {
+    margin-right: 15px;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: @iconcolor;
+}
+
+#idle_inhibitor.activated {
+    margin-right: 15px;
+    font-size: 20px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: #dc2f2f;
+}
+
+/* -----------------------------------------------------
+ * Custom Modules
+ * ----------------------------------------------------- */
+
+#custom-appmenu {
+    background-color: @backgrounddark;
+    font-size: 16px;
+    color: @textcolor1;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 10px;
+}
+
+/* -----------------------------------------------------
+ * Custom Exit
+ * ----------------------------------------------------- */
+
+#custom-exit {
+    margin: 0px 20px 0px 0px;
+    padding:0px;
+    font-size:20px;
+    color: @iconcolor;
+}
+
+/* -----------------------------------------------------
+ * Custom Updates
+ * ----------------------------------------------------- */
+
+#custom-updates {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#custom-updates.green {
+    background-color: @backgroundlight;
+}
+
+#custom-updates.yellow {
+    background-color: #ff9a3c;
+    color: #FFFFFF;
+}
+
+#custom-updates.red {
+    background-color: #dc2f2f;
+    color: #FFFFFF;
+}
+
+/* -----------------------------------------------------
+ * Custom Youtube
+ * ----------------------------------------------------- */
+
+#custom-youtube {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+/* -----------------------------------------------------
+ * Hardware Group
+ * ----------------------------------------------------- */
+
+ #disk,#memory,#cpu,#language {
+    margin:0px;
+    padding:0px;
+    font-size:16px;
+    color:@iconcolor;
+}
+
+#language {
+    margin-right:10px;
+}
+
+/* -----------------------------------------------------
+ * Clock
+ * ----------------------------------------------------- */
+
+#clock {
+    background-color: @backgrounddark;
+    font-size: 16px;
+    color: @textcolor1;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+/* -----------------------------------------------------
+ * Pulseaudio
+ * ----------------------------------------------------- */
+
+#pulseaudio {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#pulseaudio.muted {
+    background-color: @backgrounddark;
+    color: @textcolor1;
+}
+
+/* -----------------------------------------------------
+ * Network
+ * ----------------------------------------------------- */
+
+#network {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#network.ethernet {
+    background-color: @backgroundlight;
+    color: @textcolor2;
+}
+
+#network.wifi {
+    background-color: @backgroundlight;
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Bluetooth
+ * ----------------------------------------------------- */
+
+ #bluetooth, #bluetooth.on, #bluetooth.connected {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#bluetooth.off {
+    background-color: transparent;
+    padding: 0px;
+    margin: 0px;
+}
+
+/* -----------------------------------------------------
+ * Battery
+ * ----------------------------------------------------- */
+
+#battery {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 15px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#battery.charging, #battery.plugged {
+    color: @textcolor2;
+    background-color: @backgroundlight;
+}
+
+@keyframes blink {
+    to {
+        background-color: @backgroundlight;
+        color: @textcolor2;
    }
-    
-    window#waybar {
-      transition-property: background-color;
-      transition-duration: 0.5s;
-      background: transparent;
-      /*border: 2px solid @overlay0;*/
-      /*background: @theme_base_color;*/
-      border-radius: 10px;
-    }
-    
-    window#waybar.hidden {
-      opacity: 0.2;
-    }
-    
-    #waybar.empty #window {
-      background: none;
-    }
-    
-    /* This section can be use if you want to separate waybar modules */
-    .modules-left, .modules-center, .modules-right {
-        background: @theme_base_color; 
-         border: 0.5px solid @overlay0;
-        padding-top: 2px;
-        padding-bottom: 2px;
-        padding-right: 4px;
-        padding-left: 4px;
-        border-radius: 10px;
-    
-    } 
-    
-    .modules-left, .modules-right {
-          border: 1px solid @blue;
-        padding-top: 2px;
-        padding-bottom: 2px;
-        padding-right: 4px;
-        padding-left: 4px;
-    } 
-    
-    #backlight,
-    #backlight-slider,
-    #battery,
-    #bluetooth,
-    #clock,
-    #cpu,
-    #disk,
-    #idle_inhibitor,
-    #keyboard-state,
-    #memory,
-    #mode,
-    #mpris,
-    #network,
-    #pulseaudio,
-    #pulseaudio-slider,
-    #taskbar button,
-    #taskbar,
-    #temperature,
-    #tray,
-    #window,
-    #wireplumber,
-    #workspaces,
-    #custom-backlight,
-    #custom-cycle_wall,
-    #custom-hint,
-    #custom-keyboard,
-    #custom-light_dark,
-    #custom-lock,
-    #custom-menu,
-    #custom-power_vertical,
-    #custom-power,
-    #custom-swaync,
-    #custom-updater,
-    #custom-weather,
-    #custom-weather.clearNight,
-    #custom-weather.cloudyFoggyDay,
-    #custom-weather.cloudyFoggyNight,
-    #custom-weather.default, 
-    #custom-weather.rainyDay,
-    #custom-weather.rainyNight,
-    #custom-weather.severe,
-    #custom-weather.showyIcyDay,
-    #custom-weather.snowyIcyNight,
-    #custom-weather.sunnyDay {
-        padding-top: 3px;
-        padding-bottom: 3px;
-        padding-right: 6px;
-        padding-left: 6px;
-    }
-    
-    #idle_inhibitor {
-      color: @blue;
-    }
-    
-    #bluetooth,
-    #backlight {
-      color: @blue;
-    }
-    
-    #battery {
-      color: @green;
-    }
-    
-    @keyframes blink {
-      to {
-        color: @surface0;
-      }
-    }
-    
-    #battery.critical:not(.charging) {
-      background-color: @red;
-      color: @theme_text_color;
-      animation-name: blink;
-      animation-duration: 0.5s;
-      animation-timing-function: linear;
-      animation-iteration-count: infinite;
-      animation-direction: alternate;
-      box-shadow: inset 0 -3px transparent;
-    }
-    
-    #clock {
-      color: @yellow;
-    }
-    
-    #cpu {
-      color: @green;
-    }
-    
-    #custom-keyboard,
-    #memory {
-      color: @sky;
-    }
-    
-    #disk {
-      color: @sapphire;
-    }
-    
-    #temperature {
-      color: @teal;
-    }
-    
-    #temperature.critical {
-      background-color: @red;
-    }
-    
-    #tray > .passive {
-      -gtk-icon-effect: dim;
-    }
-    #tray > .needs-attention {
-      -gtk-icon-effect: highlight;
-    }
-    
-    #keyboard-state {
-      color: @flamingo;
-    }
-    
-    #workspaces button {
-        box-shadow: none;
-        text-shadow: none;
-        padding: 0px;
-        border-radius: 9px;
-        padding-left: 4px;
-        padding-right: 4px;
-        animation: gradient_f 20s ease-in infinite;
-        transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
-    }
-    
-    #workspaces button:hover {
-        border-radius: 10px;
-        color: @overlay0;
-        background-color: @surface0;
-         padding-left: 2px;
-        padding-right: 2px;
-        animation: gradient_f 20s ease-in infinite;
-        transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-    }
-    
-    #workspaces button.persistent {
-        color: @surface1;
-        border-radius: 10px;
-    }
-    
-    #workspaces button.active {
-        color: @peach;
-          border-radius: 10px;
-        padding-left: 8px;
-        padding-right: 8px;
-        animation: gradient_f 20s ease-in infinite;
-        transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-    }
-    
-    #workspaces button.urgent {
-        color: @red;
-         border-radius: 0px;
-    }
-    
-    #taskbar button.active {
-        padding-left: 8px;
-        padding-right: 8px;
-        animation: gradient_f 20s ease-in infinite;
-        transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-    }
-    
-    #taskbar button:hover {
-        padding-left: 2px;
-        padding-right: 2px;
-        animation: gradient_f 20s ease-in infinite;
-        transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-    }
-    
-    #custom-cava_mviz {
-        color: @pink;
-    }
-    
-    #custom-menu {
-      color: @rosewater;
-    }
-    
-    #custom-power {
-      color: @red;
-    }
-    
-    #custom-updater {
-      color: @red;
-    }
-    
-    #custom-light_dark {
-      color: @blue;
-    }
-    
-    #custom-weather {
-      color: @lavender;
-    }
-    
-    #custom-lock {
-      color: @maroon;
-    }
-    
-    #pulseaudio {
-      color: @sapphire;
-    }
-    
-    #pulseaudio.bluetooth {
-      color: @pink;
-    }
-    #pulseaudio.muted {
-      color: @red;
-    }
-    
-    #window {
-      color: @mauve;
-    }
-    
-    #custom-waybar-mpris {
-      color:@lavender;
-    }
-    
-    #network {
-      color: @teal;
-    }
-    #network.disconnected,
-    #network.disabled {
-      background-color: @surface0;
-      color: @text;
-    }
-    #pulseaudio-slider slider {
-        min-width: 0px;
-        min-height: 0px;
-        opacity: 0;
-        background-image: none;
-        border: none;
-        box-shadow: none;
-    }
-    
-    #pulseaudio-slider trough {
-        min-width: 80px;
-        min-height: 5px;
-        border-radius: 5px;
-    }
-    
-    #pulseaudio-slider highlight {
-        min-height: 10px;
-        border-radius: 5px;
-    }
-    
-    #backlight-slider slider {
-        min-width: 0px;
-        min-height: 0px;
-        opacity: 0;
-        background-image: none;
-        border: none;
-        box-shadow: none;
-    }
-    
-    #backlight-slider trough {
-        min-width: 80px;
-        min-height: 10px;
-        border-radius: 5px;
-    }
-    
-    #backlight-slider highlight {
-        min-width: 10px;
-        border-radius: 5px;
-    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: @textcolor3;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+/* -----------------------------------------------------
+ * Tray
+ * ----------------------------------------------------- */
+
+#tray {
+    background-color: #2980b9;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+/* -----------------------------------------------------
+ * Other
+ * ----------------------------------------------------- */
+
+label:focus {
+    background-color: #000000;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}
+
+#network {
+    background-color: #2980b9;
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
@@ -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';
@@ -8,15 +8,14 @@
 // by Stephan Raabe (2023) 
 // ----------------------------------------------------- 
 //
-[{
+{
    // General Settings
    "layer": "top",
-    "output": ["eDP-1", "DP-1", "DP-2"],
    "margin-top": 0,
    "margin-bottom": 0,
    "layer": "top",
    "margin-left": 0,
-    "margin-right": 0,
+    "margin-right": 0,    
    "spacing": 0,

    // Load Modules
@@ -35,51 +34,26 @@
    ],

    // Modules Center
-    "modules-center": [
-       "clock"
-    ],
+    //"modules-center": [
+    //    "hyprland/workspaces"
+    //],

-    // Modules Right
+    // Modules Right    
    "modules-right": [
        "custom/updates",
-        "group/hardware",
-        "group/hardware2",
+        "pulseaudio",
+        //"bluetooth",
        "battery",
        "battery#charging",
+        "network",
+        "cpu",
+        "memory",
+        //"group/hardware",
+        //"custom/cliphist",
        "tray",
-        "group/power"
-    ]
-}, {
-    // General Settings
-    "layer": "top",
-    "output": ["HDMI-A-1"],
-    "margin-top": 0,
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/themes/ml4w-blur-custom/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenuicon",
-        "hyprland/workspaces",
-        "wlr/taskbar",
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Center
-    // "modules-center": [
-    //    "clock"
-    // ],
-
-    // Modules Right
-    "modules-right": [
+        "idle_inhibitor",
+        "custom/exit",
+        //"custom/ml4w-welcome",
        "clock"
    ]
-}]
-
+}
@@ -1,12 +1,12 @@
-//  __  __           _       _
-// |  \/  | ___   __| |_   _| | ___  ___
-// | |\/| |/ _ \ / _` | | | | |/ _ \/ __|
-// | |  | | (_) | (_| | |_| | |  __/\__ \
-// |_|  |_|\___/ \__,_|\__,_|_|\___||___/
-//
-//
-// by Stephan Raabe (2023)
-// -----------------------------------------------------
+//  __  __           _       _            
+// |  \/  | ___   __| |_   _| | ___  ___  
+// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| 
+// | |  | | (_) | (_| | |_| | |  __/\__ \ 
+// |_|  |_|\___/ \__,_|\__,_|_|\___||___/ 
+//                                        
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
 //
 {
    // Workspaces
@@ -24,19 +24,18 @@
            // START WORKSPACES
            "*": 3
            // END WORKSPACES
-        }
+        }       
    },

    // Taskbar
    "wlr/taskbar": {
        "format": "{icon}",
-        "icon-size": 16,
+        "icon-size": 18,
        "tooltip-format": "{title}",
        "on-click": "activate",
        "on-click-middle": "close",
        "ignore-list": [
-           "Alacritty",
-           "kitty-dropterm"
+           "Alacritty"
        ],
        "app_ids-mapping": {
            "firefoxdeveloperedition": "firefox-developer-edition"
@@ -54,9 +53,7 @@
            "(.*) - Chromium": "$1",
            "(.*) - Brave Search": "$1",
            "(.*) - Outlook": "$1",
-            "(.*) Microsoft Teams": "$1",
-            "(.*) - Google Chrome": "$1",
-            "(.*) - Visual Studio Code": "$1"
+            "(.*) Microsoft Teams": "$1"
        },
        "separate-outputs": true
    },
@@ -81,7 +78,7 @@
        "on-click": "chromium https://studio.youtube.com",
        "tooltip": false
    },
-
+    
    // Cliphist
    "custom/cliphist": {
        "format": "",
@@ -93,17 +90,17 @@

    // Updates Count
    "custom/updates": {
-        "format": " {}",
+        "format": "  {}",
        "tooltip-format": "{}",
        "escape": true,
-        "return-type": "json",
+        "return-type": "json",       
        "exec": "~/dotfiles/scripts/updates.sh",
        "restart-interval": 60,
        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
        "on-click-right": "~/dotfiles/.settings/software.sh",
        "tooltip": false
    },
-
+    
    // Wallpaper
    "custom/wallpaper": {
        "format": "",
@@ -118,7 +115,7 @@
        "on-click": "~/dotfiles/waybar/themeswitcher.sh",
        "tooltip": false
    },
-
+    
    // Settings
    "custom/settings": {
        "format": "",
@@ -159,7 +156,7 @@
        "format": "",
        "on-click": "~/dotfiles/.settings/browser.sh",
        "tooltip": false
-    },
+    },    

    // ChatGPT Launcher
    "custom/chatgpt": {
@@ -198,7 +195,7 @@
        "on-click": "rofi -show drun -replace",
        "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
        "tooltip": false
-    },
+    },    

    // Power Menu
    "custom/exit": {
@@ -218,88 +215,40 @@
        }
    },

-    "group/tray": {
-        "orientation": "inherit",
-        "drawer": {
-            "transition-duration": 300,
-            "children-class": "not-memory",
-            "transition-left-to-right": false
-        },
-        "modules": [
-            "tray"
-        ]
-    },
-
    // System tray
    "tray": {
-        "icon-size": 16,
-        "spacing": 8,
+        "icon-size": 21,
+        "spacing": 10,
        "verse-direction": true
    },

    // Clock
    "clock": {
-        "calendar": {
-            "mode"          : "year",
-            "mode-mon-col"  : 3,
-            "weeks-pos"     : "right",
-            "on-scroll"     : 1,
-            "format": {
-                      "months":     "<span color='#ffead3'><b>{}</b></span>",
-                      "days":       "<span color='#ecc6d9'><b>{}</b></span>",
-                      "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
-                      "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
-                      "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
-                      }
-            },
        // TIMEDATEFORMAT
-        "format": "{:%B %d %H:%M %a}",
+        "format": "{:%H:%M - %a}",
        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B %d}</big>\n<tt><small>{calendar}</small></tt>",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
        // START CLOCK FORMAT
        "format-alt": "{:%Y-%m-%d}"
        // END CLOCK FORMAT
    },

-    // spacer
-    "custom/spacer": {
-        "format": " ",
-        "tooltip": false
-    },
-
-    // div
-    "custom/div": {
-        "format": "",
+    // System
+    "custom/system": {
+        "format": "",
        "tooltip": false
    },

    // CPU
    "cpu": {
-        "format": "󰒇 {usage}%",
-        "on-click": "alacritty -e htop",
-        "interval": 5,
-        "states": {
-            "warning": 50,
-            "critical": 90
-        }
+        "format": "󰒇  {usage}%",
+        "on-click": "alacritty -e htop"
    },

-    // "cpu#bar": {
-    //     "format": "{icon}",
-    //     "format-icons":[
-    //         "▏ ","▎ ","▍ ","▌ ","▋ ","▊ ","▉ ","█ ","█▏","█▎","█▍","█▌","█▋","█▊","█▉","██"
-    //     ]
-    // },
-
    // Memory
    "memory": {
-        "format": " {used:0.1f}G",
-        "on-click": "alacritty -e htop",
-        "interval": 10,
-        "states": {
-            "warning": 50,
-            "critical": 80
-        }
+        "format": "󰍛  {used:0.1f}G",
+        "on-click": "alacritty -e htop"
    },

    // Harddisc space used
@@ -308,7 +257,7 @@
        "format": "D {percentage_used}% ",
        "path": "/",
        "on-click": "alacritty -e htop"
-    },
+    }, 

    "hyprland/language": {
        "format": "/ K {short}"
@@ -316,50 +265,21 @@

    // Group Hardware
    "group/hardware": {
-        "orientation": "inherit",
-        "modules": [
-            "network#speed",
-            "custom/div",
-            "cpu",
-            "custom/div",
-            "memory"
-        ]
-    },
-
-    "group/hardware2": {
-        "orientation": "inherit",
-        "modules": [
-            "pulseaudio",
-            "custom/div",
-            "network"
-            // "custom/div",
-            // "battery",
-            // "battery#charging"
-        ]
-    },
-
-    // Group system settings
-    "group/systems": {
-        "orientation": "inherit",
-        "modules": [
-            // "user",
-            "clock"
-        ]
-    },
-
-    "group/power": {
        "orientation": "inherit",
        "drawer": {
            "transition-duration": 300,
            "children-class": "not-memory",
            "transition-left-to-right": false
-        },
+        },        
        "modules": [
-            "custom/exit",
-            "idle_inhibitor"
+            "custom/system",
+            "disk",
+            "cpu",
+            "memory",
+            "hyprland/language"
        ]
    },
-
+    
    // Group Settings
    "group/settings": {
        "orientation": "horizontal",
@@ -385,20 +305,15 @@
    // Network
    "network": {
        "format": "{ifname}",
-        "format-wifi": "{icon} {signalStrength}%",
-        "format-ethernet": " wired",
-        "format-disconnected": "󰌙",
+        "format-wifi": "   {signalStrength}%",
+        "format-ethernet": "  {ifname}",
+        "format-disconnected": "Disconnected",
        "tooltip-format": " {ifname} via {gwaddri}",
        "tooltip-format-wifi": "  {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\nUp: {bandwidthUpBits} Down: {bandwidthDownBits}",
        "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
        "tooltip-format-disconnected": "Disconnected",
        "max-length": 50,
-        "on-click": "~/dotfiles/.settings/networkmanager.sh",
-        "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-    },
-    "network#speed": {
-        "format": " {bandwidthTotalBits}",
-        "interval": 5
+        "on-click": "~/dotfiles/.settings/networkmanager.sh"
    },

    // Battery
@@ -408,7 +323,7 @@
            "warning": 30,
            "critical": 15
        },
-        "format": "{icon} {capacity}%",
+        "format": "{icon}  {capacity}%",
        "format-charging": "",
        "format-plugged": "  {capacity}%",
        "format-alt": "{icon}  {time}",
@@ -427,7 +342,7 @@
            "critical": 15
        },
        "format": "",
-        "format-charging": "{icon} {capacity}%",
+        "format-charging": "{icon}  {capacity}%",
        // "format-good": "", // An empty format will hide the module
        //"format-icons": {
        //    "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"],
@@ -439,7 +354,7 @@
    // Pulseaudio
    "pulseaudio": {
        // "scroll-step": 1, // %, can be a float
-        "format": "{icon} {volume}%",
+        "format": "{icon}",
        "format-bluetooth": "{icon} {format_source}",
        "format-bluetooth-muted": " {icon} {format_source}",
        "format-muted": " {format_source}",
@@ -482,6 +397,6 @@
            "activated": "",
            "deactivated": ""
        },
-        "on-click-right": "hyprlock"
+        "on-click-right": "hyprlock"        
    }
 }
@@ -1,33 +1,32 @@
 /*
- * __        __          _                  ____  _         _
- * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___
- *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \
- *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/
- *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___|
- *                 |___/                              |___/
- *
- * by Stephan Raabe (2023)
- * -----------------------------------------------------
+ * __        __          _                  ____  _         _       
+ * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
+ *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
+ *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
+ *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
+ *                 |___/                              |___/         
+ *  
+ * by Stephan Raabe (2023) 
+ * ----------------------------------------------------- 
 */

 /* -----------------------------------------------------
- * Import Pywal colors
+ * Import Pywal colors 
 * ----------------------------------------------------- */
 /* @import 'style-light.css'; */

 /* -----------------------------------------------------
- * General
+ * General 
 * ----------------------------------------------------- */

 * {
-    font-family: "Fira Code Nerd Font";
-    font-weight: 700;
+    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.1);
+    background-color: rgba(0,0,0,0.2);
    border-bottom: 0px solid #ffffff;
    /* color: #FFFFFF; */
    transition-property: background-color;
@@ -35,58 +34,49 @@ window#waybar {
 }

 /* -----------------------------------------------------
- * Workspaces
+ * Workspaces 
 * ----------------------------------------------------- */

 #workspaces {
    background: @workspacesbackground1;
-    margin: 8px 10px 8px 0px;
+    margin: 5px 10px 6px 0px;
    padding: 0px 1px;
-    border-radius: 10px;
+    border-radius: 15px;
    border: 0px;
    font-weight: bold;
    font-style: normal;
    opacity: 0.8;
-    font-size: 14px;
+    font-size: 16px;
    color: @textcolor1;
 }

 #workspaces button {
    padding: 0px 5px;
-    margin: 3px;
+    margin: 4px 3px;
    border-radius: 15px;
    border: 0px;
    color: @textcolor1;
-    background: @workspacesbackground2;
+    background-color: @workspacesbackground2;
    transition: all 0.3s ease-in-out;
    opacity: 0.4;
 }

-#workspaces button.empty {
-    border-radius: 15px;
-    border: 0px;
-    color: @textcolor1;
-    background: transparent;
-    transition: all 0.3s ease-in-out;
-    opacity: 0.5;
-}
-
-#workspaces button:hover {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-    border-radius: 10px;
-    opacity:0.7;
-}
-
 #workspaces button.active {
    color: @textcolor1;
    background: @workspacesbackground2;
    border-radius: 15px;
-    min-width: 30px;
+    min-width: 40px;
    transition: all 0.3s ease-in-out;
    opacity:1.0;
 }

+#workspaces button:hover {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+    opacity:0.7;
+}
+
 /* -----------------------------------------------------
 * Tooltips
 * ----------------------------------------------------- */
@@ -108,13 +98,12 @@ tooltip label {
 * ----------------------------------------------------- */

 #window {
-    font-family: "Fira Code Semibold";
    background: @backgroundlight;
-    margin: 8px 10px 8px 0px;
-    padding: 0px 8px 0px 8px;
-    border-radius: 10px;
+    margin: 6px 15px 6px 0px;
+    padding: 0px 10px 0px 10px;
+    border-radius: 15px;
    color:@textcolor2;
-    font-size: 14px;
+    font-size:16px;
    font-weight:normal;
    opacity:0.8;
 }
@@ -129,9 +118,9 @@ window#waybar.empty #window {

 #taskbar {
    background: @backgroundlight;
-    margin: 8px 10px 8px 0px;
+    margin: 6px 10px 6px 0px;
    padding:0px;
-    border-radius: 10px;
+    border-radius: 15px;
    font-weight: normal;
    font-style: normal;
    opacity:0.8;
@@ -140,15 +129,8 @@ window#waybar.empty #window {

 #taskbar button {
    margin:0;
-    border-radius: 10px;
+    border-radius: 15px;
    padding: 0px 5px 0px 5px;
-    opacity: 0.7;
-}
-
-#taskbar button.active {
-    background: @workspacesbackground2;
-    border-radius: 10px;
-    opacity:1.0;
 }


@@ -156,19 +138,19 @@ window#waybar.empty #window {
 * Custom Quicklinks
 * ----------------------------------------------------- */

-#custom-brave,
-#custom-browser,
-#custom-keybindings,
-#custom-outlook,
-#custom-filemanager,
-#custom-teams,
-#custom-chatgpt,
-#custom-calculator,
-#custom-windowsvm,
-#custom-cliphist,
-#custom-wallpaper,
-#custom-settings,
-#custom-wallpaper,
+#custom-brave, 
+#custom-browser, 
+#custom-keybindings, 
+#custom-outlook, 
+#custom-filemanager, 
+#custom-teams, 
+#custom-chatgpt, 
+#custom-calculator, 
+#custom-windowsvm, 
+#custom-cliphist, 
+#custom-wallpaper, 
+#custom-settings, 
+#custom-wallpaper, 
 #custom-system,
 #custom-waybarthemes {
    margin-right: 23px;
@@ -177,7 +159,7 @@ window#waybar.empty #window {
    opacity: 0.8;
    color: @iconcolor;
 }
-
+ 
 #custom-system {
    margin-right:15px;
 }
@@ -211,8 +193,8 @@ window#waybar.empty #window {
 * ----------------------------------------------------- */

 #idle_inhibitor {
-    margin-right: 15px;
-    font-size: 16px;
+    margin-right: 10px;
+    font-size: 22px;
    font-weight: bold;
    opacity: 0.8;
    color: @iconcolor;
@@ -232,13 +214,13 @@ window#waybar.empty #window {

 #custom-appmenu, #custom-appmenuicon {
    background-color: @backgrounddark;
-    font-size: 14px;
+    font-size: 16px;
    color: @textcolor1;
-    border-radius: 10px;
+    border-radius: 15px;
    padding: 0px 10px 0px 10px;
-    margin: 8px 10px 8px 10px;
+    margin: 6px 10px 6px 10px;
    opacity:0.8;
-    /* border:3px solid @bordercolor; */
+    border:3px solid @bordercolor;
 }

 #custom-appmenuicon {
@@ -251,13 +233,10 @@ window#waybar.empty #window {
 * ----------------------------------------------------- */

 #custom-exit {
-    margin: 8px 10px 8px 0px;
-    padding:0px 14px 0px 10px;
-    font-size: 14px;
+    margin: 0px 15px 0px 0px;
+    padding:0px;
+    font-size:20px;
    color: @iconcolor;
-    background: @backgrounddark;
-    border-radius: 10px;
-    opacity: 0.8;
 }

 /* -----------------------------------------------------
@@ -266,9 +245,9 @@ window#waybar.empty #window {

 #custom-updates {
    background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
    color: @textcolor2;
-    border-radius: 10px;
+    border-radius: 15px;
    padding: 2px 10px 0px 10px;
    margin: 8px 10px 8px 0px;
    opacity:0.8;
@@ -294,9 +273,9 @@ window#waybar.empty #window {

 #custom-youtube {
    background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
    color: @textcolor2;
-    border-radius: 10px;
+    border-radius: 15px;
    padding: 2px 10px 0px 10px;
    margin: 8px 15px 8px 0px;
    opacity:0.8;
@@ -306,43 +285,14 @@ window#waybar.empty #window {
 * Hardware Group
 * ----------------------------------------------------- */

- /* #disk,#memory,#cpu,#language {
+ #disk,#memory,#cpu,#language {
    background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
    color: @textcolor2;
-    border-radius: 10px;
+    border-radius: 15px;
    padding: 2px 10px 0px 10px;
    margin: 8px 10px 8px 0px;
    opacity:0.8;
-} */
-
-/* #cpu {
-    color: @color2;
-} */
-
-#cpu.warning,#memory.warning{
-    color: #ff9800;
-}
-
-#cpu.critical,#memory.warning{
-    color: #f44336;
-}
-
-#hardware,#hardware2 {
-    background-color: @backgroundlight;
-    font-size: 14px;
-    color: @textcolor2;
-    border-radius: 10px;
-    padding: 0px 10px 0px 10px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
-}
-
-#custom-div {
-    font-weight: 900;
-    padding: 0px 2px;
-    color: @color2;
-    font-size: 18px;
 }

 #language {
@@ -354,14 +304,14 @@ window#waybar.empty #window {
 * ----------------------------------------------------- */

 #clock {
-    background-color: @backgroundlight;
-    font-size: 14px;
+    background-color: @backgrounddark;
+    font-size: 16px;
    color: @textcolor1;
-    border-radius: 10px;
-    padding: 0px 8px 0px 8px;
-    margin: 8px 10px 8px 0px;
+    border-radius: 15px;
+    padding: 1px 10px 0px 10px;
+    margin: 6px 10px 6px 0px;
    opacity:0.8;
-    /* border:3px solid @bordercolor; */
+    border:3px solid @bordercolor;   
 }

 /* -----------------------------------------------------
@@ -369,51 +319,41 @@ window#waybar.empty #window {
 * ----------------------------------------------------- */

 #pulseaudio {
-    /* background-color: @backgroundlight; */
-    font-size: 14px;
+    background-color: @backgroundlight;
+    font-size: 16px;
    color: @textcolor2;
-    /* border-radius: 10px; */
-    /* padding: 0px 10px 0px 10px; */
-    /* margin: 8px 10px 8px 0px; */
-    /* opacity:0.8; */
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
 }

 #pulseaudio.muted {
-    /* background-color: @backgrounddark; */
+    background-color: @backgrounddark;
    color: @textcolor1;
 }

-#systems {
-    background-color: @backgroundlight;
-    font-size: 14px;
-    color: @textcolor2;
-    border-radius: 10px;
-    padding: 0px 10px 0px 10px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
-}
-
 /* -----------------------------------------------------
 * Network
 * ----------------------------------------------------- */

 #network {
-    /* background-color: @backgroundlight; */
-    font-size: 14px;
+    background-color: @backgroundlight;
+    font-size: 16px;
    color: @textcolor2;
-    /* border-radius: 10px; */
-    /* padding: 2px 2px 0px 10px; */
-    /* margin: 8px 10px 8px 0px; */
-    /* opacity:0.8; */
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
 }

 #network.ethernet {
-    /* background-color: @backgroundlight; */
+    background-color: @backgroundlight;
    color: @textcolor2;
 }

 #network.wifi {
-    /* background-color: @backgroundlight; */
+    background-color: @backgroundlight;
    color: @textcolor2;
 }

@@ -423,12 +363,12 @@ window#waybar.empty #window {

 #bluetooth, #bluetooth.on, #bluetooth.connected {
    background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
    color: @textcolor2;
-    border-radius: 10px;
+    border-radius: 15px;
    padding: 2px 10px 0px 10px;
    margin: 8px 10px 8px 0px;
-    /* opacity:0.8; */
+    opacity:0.8;
 }

 #bluetooth.off {
@@ -443,10 +383,10 @@ window#waybar.empty #window {

 #battery {
    background-color: @backgroundlight;
-    font-size: 14px;
+    font-size: 16px;
    color: @textcolor2;
-    border-radius: 10px;
-    padding: 0px 10px 0px 10px;
+    border-radius: 15px;
+    padding: 2px 15px 0px 10px;
    margin: 8px 10px 8px 0px;
    opacity:0.8;
 }
@@ -478,13 +418,8 @@ window#waybar.empty #window {
 * ----------------------------------------------------- */

 #tray {
-    padding: 0px 10px 0px 10px;
+    padding: 0px 10px 0px 0px;
    color: @textcolor3;
-    background-color: @backgroundlight;
-    font-size: 14px;
-    border-radius: 10px;
-    margin: 8px 10px 8px 0px;
-    opacity:0.8;
 }

 #tray > .passive {
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
Stephan Raabe	95ff240509	Updates	2024-06-12 13:02:08 +02:00
Stephan Raabe	d6fce7ecd3	Updates	2024-06-12 13:00:40 +02:00
Stephan Raabe	44b52eecb4	Updates	2024-06-12 12:32:03 +02:00
Stephan Raabe	fc346fe68d	Updates	2024-06-12 10:20:13 +02:00
Stephan Raabe	0a6879e9ab	Updates	2024-06-12 07:26:20 +02:00
Stephan Raabe	e5fbdb7de0	Updates	2024-06-09 15:33:11 +02:00
Stephan Raabe	26f42750d7	Updates	2024-06-07 22:07:10 +02:00
Stephan Raabe	e6c2420ef4	Updates	2024-06-07 21:25:01 +02:00
Stephan Raabe	338f34b28d	Updates	2024-06-07 20:53:47 +02:00
Stephan Raabe	972d49978c	Updates	2024-06-05 17:05:48 +02:00
wyj	c2d2d45546	Merge branch 'upstream-main' into fcitx5	2024-06-05 05:50:50 -04:00
Stephan Raabe	41b6b496c1	Updates	2024-06-05 10:40:53 +02:00
Stephan Raabe	7f945d3143	Updates	2024-06-05 08:55:24 +02: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 +1 @@
 .9.1.1
 .9.1.2
				`@@ -1 +0,0 @@`
				`--ozone-platform=wayland --enable-wayland-ime`