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
117 changed files with 1561 additions and 1843 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
@@ -40,18 +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
-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."
@@ -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 +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 +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...
@@ -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
@@ -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
@@ -7,89 +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, 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,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.
 }
@@ -12,12 +12,5 @@ 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
+    workspace_swipe = true
 }
@@ -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,6 +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)$
@@ -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
+    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
@@ -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
@@ -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"
@@ -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 {
@@ -158,6 +157,7 @@ listview {
    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 {
@@ -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
--- 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
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`