update: update fastfetch config

Merge branch 'upstream-custom' into dev
update: make xdg-desktop-portal-gtk float
2024-07-29 01:28:09 -04:00 · 2024-06-15 23:08:53 -04:00 · 2024-06-15 23:08:33 -04:00 · 2024-06-13 21:30:12 -04:00 · 2024-06-13 21:29:56 -04:00 · 2024-06-13 21:29:43 -04:00
115 changed files with 2807 additions and 446 deletions
@@ -109,7 +109,7 @@ alias setkb='setxkbmap de;echo "Keyboard set back to de."'
 alias res1='xrandr --output DisplayPort-0 --mode 2560x1440 --rate 120'
 alias res2='xrandr --output DisplayPort-0 --mode 1920x1080 --rate 120'

-export PATH="/usr/lib/ccache/bin/:$PATH"
+export PATH="$HOME/.local/bin/:/usr/lib/ccache/bin/:$PATH"

 # -----------------------------------------------------
 # DEVELOPMENT
@@ -13,24 +13,6 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
    fi
 fi

-# Check for running NetworkManager.service
-if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then
-    echo ":: NetworkManager.service already running."
-else
-    sudo systemctl enable NetworkManager.service
-    sudo systemctl start NetworkManager.service
-    echo ":: NetworkManager.service activated successfully."    
-fi
-
-# Check for running bluetooth.service
-if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then
-    echo ":: bluetooth.service already running."
-else
-    sudo systemctl enable bluetooth.service
-    sudo systemctl start bluetooth.service
-    echo ":: bluetooth.service activated successfully."    
-fi
-
 if [ -d ~/dotfiles/hypr/settings/ ] ;then
    rm -rf ~/dotfiles/hypr/settings
    echo ":: ~/dotfiles/hypr/settings removed."
@@ -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
@@ -0,0 +1,21 @@
+
+# ------------------------------------------------------
+# hidpi support
+# ------------------------------------------------------
+
+echo -e "${GREEN}"
+figlet "hidpi"
+echo -e "${NONE}"
+
+hidpiconfirm="Do you want 2x hidpi scale?"
+if gum confirm "$hidpiconfirm"; then
+    sed -i -E 's/size = [0-9]+(\.[0-9]+)?/size = 16/' ~/dotfiles-versions/$version/alacritty/alacritty.toml
+    sed -i -E 's/[0-9]+(\.[0-9]+)?/16/' ~/dotfiles-versions/$version/.settings/rofi-font.rasi
+    echo -e '\n# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e '# HiDPI Scaling' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e '# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e 'source = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    sed -i -E 's/1/2/' ~/dotfiles-versions/$version/hypr/conf/monitors/default.conf
+    sed -i -E 's/24/32/' ~/dotfiles-versions/$version/hypr/conf/cursor.conf
+    echo ":: finished hidpi patch."
+fi
@@ -5,6 +5,9 @@
 if [ -d ~/dotfiles-versions/$version/alacritty ]; then
    _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
 fi
+if [ -d ~/dotfiles-versions/$version/kitty ]; then
+    _installSymLink kitty ~/.config/kitty ~/dotfiles/kitty/ ~/.config
+fi
 if [ -d ~/dotfiles-versions/$version/vim ]; then
    _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
 fi
@@ -43,5 +46,12 @@ fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
 fi
+if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then
+    _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/Vimix-hyprcursors ]; then
+    if [ ! -d ~/.local/share/icons ]; then mkdir -pv ~/.local/share/icons; fi
+    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors ~/.local/share/icons/
+fi
 echo ":: Symbolic links created."
 echo
@@ -1,65 +1,57 @@
 packagesPacman=(
    "pacman-contrib"
    "vim"
-    "bluez"
-    "bluez-utils"
+    "bat"
+    "fzf"
+    "zsh"
+    "fastfetch"
+    "ranger"
+    "btop"
    "neovim"
    "wget"
    "unzip"
-    "alacritty" 
-    "chromium" 
-    "dunst" 
+    "alacritty"
+    "dunst"
    "starship"
-    "mpv" 
+    "mpv"
    "thunar"
-    "nautilus" 
-    "mousepad"
-    "noto-fonts" 
-    "otf-font-awesome" 
-    "ttf-fira-sans" 
-    "ttf-fira-code" 
-    "ttf-firacode-nerd" 
-    "figlet" 
-    "vlc" 
-    "eza" 
-    "python-pip" 
-    "python-psutil" 
-    "python-rich" 
-    "python-click" 
+    "nautilus"
+    "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-pywal"
-    "python-gobject"
-    "pavucontrol" 
-    "tumbler" 
+    "pavucontrol"
+    "tumbler"
    "papirus-icon-theme"
-    "breeze-icons"
-    "polkit-gnome"
-    "brightnessctl"
    "gum"
    "man-pages"
-    "nm-connection-editor"
    "gvfs"
    "xdg-user-dirs"
    "xdg-desktop-portal-gtk"
-    "networkmanager"
-    "network-manager-applet"
    "xarchiver"
    "thunar-archive-plugin"
    "zip"
    "fuse2"
-    "gtk4"
-    "libadwaita"
    "xdg-desktop-portal"
    "qalculate-gtk"
    "imagemagick"
-    "guvcview"
    "jq"
    "rofi-wayland"
    "fastfetch"
-    "blueman"
 );

 packagesYay=(
-    "bibata-cursor-theme" 
+    "vimix-cursors"
+    "orchis-theme"
    "trizen"
-    "pacseek"
+    "google-chrome"
 );
@@ -3,15 +3,17 @@ packagesPacman=(
    "hyprpaper"
    "hyprlock"
    "hypridle"
-    "xdg-desktop-portal-hyprland" 
-    "waybar" 
-    "grim" 
+    "xdg-desktop-portal-hyprland"
+    "waybar"
+    "grim"
    "slurp"
    "swappy"
    "cliphist"
+    "kitty"
 );

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

 [font.normal]
 family = "FiraCode Nerd Font"
@@ -11,3 +11,6 @@ opacity = 0.7
 [window.padding]
 x = 15
 y = 15
+
+[selection]
+save_to_clipboard = true
@@ -0,0 +1 @@
+--ozone-platform=wayland --enable-wayland-ime
@@ -1,110 +1,161 @@
-//  Thanks to Bina
+// Note that you must replace the image path to an existing image to display it.
 {
-  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-  "logo": {
-      "padding": {
-      "top": 2
-      }
-  },
-  "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",
-  ]
-}
+    "$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󱓻 "
+        }
+    ]
+}
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/default.conf
+source = ~/dotfiles/hypr/conf/animations/animations-high.conf
@@ -29,8 +29,8 @@ exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
 # Start ewww daemon
 exec-once = ~/dotfiles/hypr/scripts/eww.sh

+exec-once = pypr
+
+
 # Start autostart cleanup
 exec-once = ~/dotfiles/hypr/scripts/cleanup.sh
-
-# Load configuration from ML4W Hyprland Settings App
-exec = ~/.config/ml4w-hyprland-settings/hyprctl.sh
@@ -1 +1,2 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+exec-once = hyprctl setcursor Vimix-hyprcursors 24
+env = HYPRCURSOR_THEME,Vimix-hyprcursors
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/decorations/default.conf
+source = ~/dotfiles/hypr/conf/decorations/custom.conf
@@ -0,0 +1,25 @@
+# ----------------------------------------------------- 
+# General window decoration
+# name: "Default"
+# ----------------------------------------------------- 
+
+decoration {
+    rounding = 10
+    blur {
+        enabled = true
+        size = 10
+        passes = 3
+        new_optimizations = on
+        ignore_opacity = true
+        xray = false
+        blurls = waybar
+    }
+    active_opacity = 1.0
+    inactive_opacity = 0.8
+    fullscreen_opacity = 1.0
+
+    drop_shadow = true
+    shadow_range = 30
+    shadow_render_power = 3
+    col.shadow = 0x66000000
+}
@@ -0,0 +1,5 @@
+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
@@ -0,0 +1,6 @@
+xwayland {
+  force_zero_scaling = true
+}
+
+env = GDK_SCALE,2
+env = QT_SCALE_FACTOR,2
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/keybindings/default.conf
+source = ~/dotfiles/hypr/conf/keybindings/custom.conf
@@ -0,0 +1,100 @@
+# -----------------------------------------------------
+# Key bindings
+# name: "Default"
+# -----------------------------------------------------
+
+# SUPER KEY
+$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
+
+# 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
+
+# Actions
+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, 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
+
+# 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
+bind = $mainMod CTRL, left, workspace, e-1
+bind = $mainMod CTRL, right, workspace, e+1
+
+# 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% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')"
+bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $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
+
+# Passthrough SUPER KEY to Virtual Machine
+bind = $mainMod, P, submap, passthru
+submap = passthru
+bind = SUPER, Escape, submap, reset
+submap = reset
+
+# Pyprland
+bind = $mainMod SHIFT, RETURN, exec, pypr toggle term
@@ -3,15 +3,17 @@
 # https://wiki.hyprland.org/Configuring/Variables/#input
 # -----------------------------------------------------
 input {
-    kb_layout = de
-    kb_variant = 
+    kb_layout = us
+    kb_variant =
    kb_model =
    kb_options =
    numlock_by_default = true
    follow_mouse = 1
    mouse_refocus=false
    touchpad {
-        natural_scroll = false
+        natural_scroll = true
+        disable_while_typing=true
+        tap-to-click=true
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
@@ -12,5 +12,12 @@ master {
 }

 gestures {
-    workspace_swipe = true
+  workspace_swipe=true
+  workspace_swipe_fingers=3
+  workspace_swipe_distance=400
+  workspace_swipe_invert=true
+  workspace_swipe_min_speed_to_force=30
+  workspace_swipe_cancel_ratio=0.5
+  workspace_swipe_create_new=true
+  workspace_swipe_forever=true
 }
@@ -5,4 +5,6 @@
 misc {
    disable_hyprland_logo = true
    disable_splash_rendering = true
+    enable_swallow = true
+    swallow_regex = ^(Alacritty)$
 }
@@ -0,0 +1,6 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+monitor=,preferred,auto,2
@@ -0,0 +1,10 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+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
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/windowrules/default.conf
+source = ~/dotfiles/hypr/conf/windowrules/custom.conf
@@ -0,0 +1,22 @@
+# -----------------------------------------------------
+# Window rules
+# -----------------------------------------------------
+
+windowrule = tile,^(Microsoft-edge)$
+windowrule = tile,^(Brave-browser)$
+windowrule = tile,^(Chromium)$
+windowrule = float,^(pavucontrol)$
+windowrule = float,^(blueman-manager)$
+windowrule = float,^(nm-connection-editor)$
+windowrule = float,^(qalculate-gtk)$
+windowrule = float,^(showmethekey-gtk)$
+windowrule = pin,^(showmethekey-gtk)$
+layerrule = blur, gtk-layer-shell
+layerrule = blur, logout_dialog
+
+windowrule = float,title=^(Mathematica)$
+windowrule = opacity 0.75, ^(Code)$
+windowrule = opacity 0.75, ^(code-url-handler)$
+windowrule = float,^(QQ)$
+windowrule = float,^(fdm)$
+windowrule = float,^(xdg-desktop-portal-gtk)$
@@ -6,7 +6,7 @@
 general {
    gaps_in = 10
    gaps_out = 14
-    border_size = 3
+    border_size = 2
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
@@ -1,48 +1,48 @@
-#  _   _                  _                 _  
-# | | | |_   _ _ __  _ __| | __ _ _ __   __| | 
-# | |_| | | | | '_ \| '__| |/ _` | '_ \ / _` | 
-# |  _  | |_| | |_) | |  | | (_| | | | | (_| | 
-# |_| |_|\__, | .__/|_|  |_|\__,_|_| |_|\__,_| 
-#        |___/|_|                              
-#  
-# ----------------------------------------------------- 
+#  _   _                  _                 _
+# | | | |_   _ _ __  _ __| | __ _ _ __   __| |
+# | |_| | | | | '_ \| '__| |/ _` | '_ \ / _` |
+# |  _  | |_| | |_) | |  | | (_| | | | | (_| |
+# |_| |_|\__, | .__/|_|  |_|\__,_|_| |_|\__,_|
+#        |___/|_|
+#
+# -----------------------------------------------------
 # IMPORTANT: Don't overwrite ML4W configuration.
 # Create your own custom configuration variation instead.
 # https://gitlab.com/stephan-raabe/dotfiles#hyprland-configuration-variations

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Monitor
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/monitor.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Autostart
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/autostart.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Cursor
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/cursor.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Environment
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/environment.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Keyboard
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/keyboard.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Load pywal color file
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/.cache/wal/colors-hyprland.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Load configuration files
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/window.conf
 source = ~/dotfiles/hypr/conf/decoration.conf
 source = ~/dotfiles/hypr/conf/layout.conf
@@ -50,22 +50,22 @@ source = ~/dotfiles/hypr/conf/misc.conf
 source = ~/dotfiles/hypr/conf/keybinding.conf
 source = ~/dotfiles/hypr/conf/windowrule.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Animation
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/animation.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Custom
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/custom.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # ML4W Configuration
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/ml4w.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Environment for xdg-desktop-portal-hyprland
-# ----------------------------------------------------- 
-exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+# -----------------------------------------------------
+exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@@ -0,0 +1,12 @@
+[pyprland]
+
+plugins = [
+  "scratchpads",
+  "magnify",
+]
+
+[scratchpads.term]
+animation = "fromTop"
+command = "kitty --class kitty-dropterm"
+class = "kitty-dropterm"
+size = "75% 60%"
@@ -29,7 +29,7 @@ gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
 gsettings set "$gnome_schema" font-name "$font_name"
 gsettings set "$gnome_schema" color-scheme "prefer-dark"

-if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
-    echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
-    hyprctl setcursor $cursor_theme $cursor_size
-fi
+# if [ -f ~/dotfiles/hypr/conf/cursor.conf ] ;then
+#     echo "exec-once = hyprctl setcursor $cursor_theme $cursor_size" > ~/dotfiles/hypr/conf/cursor.conf
+#     hyprctl setcursor $cursor_theme $cursor_size
+# fi
@@ -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}"
@@ -61,6 +62,7 @@ if [[ $profile == *"Qtile"* ]]; then
    source .install/install-packages.sh
 fi
 source .install/wallpaper.sh
+source .install/hidpi.sh
 source .install/displaymanager.sh
 source .install/issue.sh
 source .install/restore.sh
@@ -0,0 +1,14 @@
+font_family     Fira Code Nerd Font
+font_size 	    14.0
+bold_font       auto
+italic_font      auto
+bold_italic_font auto
+
+background_opacity 0.7
+
+confirm_os_window_close 0
+
+enable_audio_bell no
+
+selection_foreground #000000
+selection_background #F5FBFF
@@ -38,12 +38,13 @@ configuration {

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

 /* ---- Window ---- */
 window {
    width:                        400px;
    x-offset:                     -14px;
-    y-offset:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -56,7 +57,7 @@ window {
    anchor:                       northeast;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -120,6 +121,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -132,7 +134,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -160,7 +162,8 @@ listview {
    padding:                      10px;
    margin:                       0px;
    background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -170,7 +173,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -39,6 +39,7 @@ configuration {

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

 /* ---- Window ---- */
 window {
@@ -57,7 +58,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -121,6 +122,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -133,7 +135,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -161,7 +163,8 @@ listview {
    padding:                      10px;
    margin:                       0px;
    background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -171,7 +174,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,6 +38,7 @@ configuration {

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

 /* ---- Window ---- */
 window {
@@ -56,7 +57,7 @@ window {
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -132,7 +133,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -170,7 +171,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,6 +38,7 @@ configuration {

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

 /* ---- Window ---- */
 window {
@@ -56,7 +57,7 @@ window {
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -132,7 +133,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -170,7 +171,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,6 +38,7 @@ configuration {

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

 /* ---- Window ---- */
 window {
@@ -57,7 +58,7 @@ window {
    anchor:                       northeast;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -133,7 +134,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -171,7 +172,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,12 +38,13 @@ configuration {

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

 /* ---- Window ---- */
 window {
    width:                        400px;
    x-offset:                     0px;
-    y-offset:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -56,7 +57,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -120,6 +121,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -132,7 +134,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -160,7 +162,8 @@ listview {
    padding:                      10px;
    margin:                       0px;
    background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -170,7 +173,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -33,12 +33,13 @@ configuration {

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

 /* ---- Window ---- */
 window {
    width:                        761px;
    x-offset:                     0px;
-    y-offset:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -51,7 +52,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -114,6 +115,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -126,7 +128,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -152,9 +154,10 @@ listview {
    padding:                      10px;
    margin:                       0px;
    fixed-height:                 true;
-    fixed-columns:                true;    
+    fixed-columns:                true;
    background-color:             @background;
    border:                       0px;
+    border-radius:                0px;
    flow:                         horizontal;      
 }

@@ -165,7 +168,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
    orientation:                  vertical;
 }
@@ -39,6 +39,7 @@ configuration {

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

 /* ---- Window ---- */
 window {
@@ -50,14 +51,14 @@ window {
    margin:                       0px; 
    color:                        #FFFFFF;
    border:                       @border-width;
-    border-color:                 #FFFFFF;
+    border-color:                 @foreground;
    cursor:                       "default";
    transparency:                 "real";
    location:                     center;
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -99,7 +100,7 @@ inputbar {
    text-color:                   @foreground;
    spacing:                      10px;
    padding:                      15px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border-color:                 @foreground;
    background-color:             @background;
    children:                     [ "textbox-prompt-colon", "entry" ];
@@ -121,6 +122,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -133,7 +135,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -171,7 +173,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -1 +0,0 @@
-thunar
@@ -1,42 +0,0 @@
-#!/bin/bash
-#  _____ _                     _     _  __ _   
-# |_   _(_)_ __ ___   ___  ___| |__ (_)/ _| |_ 
-#   | | | | '_ ` _ \ / _ \/ __| '_ \| | |_| __|
-#   | | | | | | | | |  __/\__ \ | | | |  _| |_ 
-#   |_| |_|_| |_| |_|\___||___/_| |_|_|_|  \__|
-#                                              
-
-sleep 1
-clear
-figlet "Timeshift"
-
-_isInstalledYay() {
-    package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
-    if [ -n "${check}" ] ; then
-        echo 0; #'0' means 'true' in Bash
-        return; #true
-    fi;
-    echo 1; #'1' means 'false' in Bash
-    return; #false
-}
-
-timeshift_installed=$(_isInstalledYay "timeshift")
-grubbtrfs_installed=$(_isInstalledYay "grub-btrfs")
-
-if [[ $timeshift_installed == "0" ]] ;then
-    echo ":: Timeshift is already installed"
-else
-    if gum confirm "DO YOU WANT TO INSTALL Timeshift now?" ;then
-        yay -S timeshift
-    fi
-fi
-if [[ -d /boot/grub ]] && [[ $grubbtrfs_installed == "0" ]] ;then
-    echo ":: grub-btrfs is already installed"
-else
-    echo ":: grub-btrfs is required to select a snapshot on grub bootloader."
-    if gum confirm "DO YOU WANT TO INSTALL grub-btrfs now?" ;then
-        yay -S grub-btrfs
-    fi
-fi
-sleep 3
@@ -1,66 +0,0 @@
-#!/bin/bash
-#  ___           _        _ _   _   _           _       _             
-# |_ _|_ __  ___| |_ __ _| | | | | | |_ __   __| | __ _| |_ ___  ___  
-#  | || '_ \/ __| __/ _` | | | | | | | '_ \ / _` |/ _` | __/ _ \/ __| 
-#  | || | | \__ \ || (_| | | | | |_| | |_) | (_| | (_| | ||  __/\__ \ 
-# |___|_| |_|___/\__\__,_|_|_|  \___/| .__/ \__,_|\__,_|\__\___||___/ 
-#                                    |_|                              
-# by Stephan Raabe (2024) 
-# ----------------------------------------------------- 
-# Required: yay trizen timeshift btrfs-grub
-# ----------------------------------------------------- 
-
-sleep 1
-clear
-figlet "Updates"
-echo
-_isInstalledYay() {
-    package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
-    if [ -n "${check}" ] ; then
-        echo 0; #'0' means 'true' in Bash
-        return; #true
-    fi;
-    echo 1; #'1' means 'false' in Bash
-    return; #false
-}
-
-# ------------------------------------------------------
-# Confirm Start
-# ------------------------------------------------------
-
-if gum confirm "DO YOU WANT TO START THE UPDATE NOW?" ;then
-    echo 
-    echo ":: Update started."
-elif [ $? -eq 130 ]; then
-        exit 130
-else
-    echo
-    echo ":: Update canceled."
-    exit;
-fi
-
-if [[ $(_isInstalledYay "timeshift") == "0" ]] ;then
-    if gum confirm "DO YOU WANT TO CREATE A SNAPSHOT?" ;then
-        echo
-        c=$(gum input --placeholder "Enter a comment for the snapshot...")
-        sudo timeshift --create --comments "$c"
-        sudo timeshift --list
-        sudo grub-mkconfig -o /boot/grub/grub.cfg
-        echo ":: DONE. Snapshot $c created!"
-        echo
-    elif [ $? -eq 130 ]; then
-        echo ":: Snapshot canceled."
-        exit 130
-    else
-        echo ":: Snapshot canceled."
-    fi
-    echo
-fi
-
-yay
-
-notify-send "Update complete"
-echo 
-echo ":: Update complete"
-sleep 2
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wyj	998a22b553	update: update fastfetch config	2024-07-29 01:28:09 -04:00
wyj	67e2505545	Merge branch 'upstream-custom' into dev	2024-06-15 23:08:53 -04:00
wyj	ef44c3b7ff	update: make xdg-desktop-portal-gtk float	2024-06-15 23:08:33 -04:00
wyj	5ce679affd	Merge branch 'zshfish' into dev	2024-06-13 21:30:12 -04:00
wyj	93eea9a463	Merge branch 'fcitx5' into dev	2024-06-13 21:29:56 -04:00
wyj	26c68b27ac	Merge branch 'upstream-hidpi' into dev	2024-06-13 21:29:43 -04:00
wyj	198a1cd956	Merge branch 'upstream-custom' into dev	2024-06-13 21:29:27 -04:00
wyj	d3277bd7fc	Merge branch 'upstream-main' into fcitx5	2024-06-13 21:28:51 -04:00
wyj	13750bb854	Merge branch 'upstream-main' into upstream-hidpi	2024-06-13 21:27:55 -04:00
wyj	164e56e0b1	Merge branch 'upstream-main' into upstream-custom	2024-06-13 21:27:01 -04:00
wyj	c37f2e2040	Merge branches 'upstream-custom' and 'upstream-hidpi' into dev	2024-06-12 23:26:20 -04:00
wyj	fa96759ddf	update: change hyprcursor size to 32 if hidpi	2024-06-12 23:26:06 -04:00
wyj	0120c08205	update: use Vimix-hyprcursors instead	2024-06-12 23:20:42 -04:00
wyj	0746e2ab13	Merge branch 'upstream-hidpi' into dev	2024-06-12 23:16:31 -04:00
wyj	ea854b83e6	update: hidpi move to hyprland.conf	2024-06-12 23:15:23 -04:00
wyj	08ee7cf4dc	Merge branch 'upstream-custom' into dev	2024-06-10 18:14:58 -04:00
wyj	e1801c20cb	fix: link of vimix hyprcursor	2024-06-10 18:05:07 -04:00
wyj	60e96faf42	Merge branch 'upstream-custom' into dev	2024-06-09 20:29:19 -04:00
wyj	8fb376e095	update: float fdm	2024-06-09 20:29:06 -04:00
wyj	34cda567b3	update: add tray on sencond display	2024-06-09 20:23:15 -04:00
wyj	d1036c31c6	update: split my waybar theme as standalone meow-blur	2024-06-09 13:38:26 -04:00
wyj	b156843244	fix: also set opacity for wayland vscode	2024-06-09 13:24:27 -04:00
wyj	d2d71fef55	fix: disable use cursors from gtk, so hyprcursors will be used	2024-06-09 13:21:27 -04:00
wyj	27b802d4a0	Merge branch 'zshfish' into dev	2024-06-07 04:35:28 -04:00
wyj	ea979c58a4	Merge branch 'zshfish' into dev	2024-06-07 04:14:16 -04:00
wyj	6b4977e52a	Merge branch 'zshfish' into dev	2024-06-07 04:08:56 -04:00
wyj	f88efba29e	Merge branch 'zshfish' into dev	2024-06-07 04:05:52 -04:00
wyj	12a4ccbc13	Merge branches 'upstream-custom' and 'zshfish' into dev	2024-06-07 03:09:40 -04:00
wyj	bc97bf2569	update: change some keybings	2024-06-07 01:51:20 -04:00
wyj	6e5fed1913	Merge branch 'upstream-custom' into dev	2024-06-06 01:03:16 -04:00
wyj	7e2f972430	update: add vimix cursor and orchis theme	2024-06-06 01:02:38 -04:00
wyj	5ad9e37759	Merge branch 'upstream-custom' into dev	2024-06-06 00:59:44 -04:00
wyj	3ba0df7b7c	update: more cleanup	2024-06-06 00:57:18 -04:00
wyj	a23d8a5c38	update: remove the fucking unused packages	2024-06-06 00:35:28 -04:00
wyj	6cd8154bab	update: Vimix hyprcursors	2024-06-05 23:20:28 -04:00
wyj	35c4cf74d2	Merge branch 'zshfish' into dev	2024-06-05 05:57:46 -04:00
wyj	04496cb334	Merge branch 'fcitx5' into dev	2024-06-05 05:57:40 -04:00
wyj	7e5feec5e0	Merge branch 'upstream-hidpi' into dev	2024-06-05 05:57:32 -04:00
wyj	72a185c97e	Merge branch 'upstream-custom' into dev	2024-06-05 05:57:18 -04:00
wyj	3bc6335304	update: get my laptop layout back	2024-06-05 05:56:08 -04:00
wyj	36764c77b3	Merge branch 'upstream-main' into upstream-hidpi	2024-06-05 05:51:38 -04:00
wyj	c2d2d45546	Merge branch 'upstream-main' into fcitx5	2024-06-05 05:50:50 -04:00
wyj	ac677d9bb9	Merge branch 'upstream-main' into upstream-custom	2024-06-05 05:50:17 -04:00
wyj	1331fab4fb	Merge branch 'upstream-custom' into dev	2024-06-04 16:52:47 -04:00
wyj	245ab326fd	update: use drawer to have idle_inhibiner	2024-06-04 16:52:29 -04:00
wyj	0a4d1b5a6a	Merge branch 'upstream-custom' into dev	2024-05-28 16:20:13 -04:00
wyj	5326446dd7	fix: typo: ture->true	2024-05-28 16:19:42 -04:00
wyj	60fc0572f0	Merge branch 'upstream-custom' into dev	2024-05-28 15:13:02 -04:00
wyj	827adc2140	update: add DP-2 in waybar	2024-05-28 15:12:43 -04:00
wyj	2b45dd70d5	Merge branch 'upstream-custom' into dev	2024-05-28 02:19:43 -04:00
wyj	d890fad373	feat: add window swallow	2024-05-28 02:19:29 -04:00
wyj	b6507b5b36	Merge branch 'upstream-custom' into dev	2024-05-27 03:37:54 -04:00
wyj	604242d58d	fix: change workspace button style order	2024-05-27 03:37:38 -04:00
wyj	dc31d31fb0	Merge branch 'upstream-custom' into dev	2024-05-27 00:28:16 -04:00
wyj	a479750bd7	update: add laptop touchpad and gestures	2024-05-26 19:21:50 -04:00
wyj	9971614a64	update: add laptop touchpad and gestures	2024-05-26 19:20:39 -04:00
wyj	308cf54c19	Merge branch 'upstream-custom' into dev	2024-05-26 19:08:43 -04:00
wyj	08947e991c	update: battery icon and space	2024-05-26 18:47:31 -04:00
wyj	3ca359ce96	fix: add kitty config	2024-05-26 18:41:55 -04:00
wyj	a6ee6ced28	Merge branch 'upstream-custom' into dev	2024-05-26 18:34:53 -04:00
wyj	8a05e91018	update: add ttf-firacode-nerd	2024-05-26 18:24:11 -04:00
wyj	43e564e47a	update: waybar	2024-05-26 18:22:25 -04:00
wyj	1f63a28eeb	Merge branch 'upstream-custom' into dev	2024-05-26 02:54:37 -04:00
wyj	6cf2a43c2c	update: waybar	2024-05-26 02:54:26 -04:00
wyj	967c5bbc57	update: remove pfetch	2024-05-26 02:06:39 -04:00
wyj	ca4b934dcf	update: change cursor to vimix	2024-05-26 02:05:37 -04:00
wyj	507143360d	Merge branch 'upstream-custom' into dev	2024-05-26 01:59:43 -04:00
wyj	2a3b26adb7	update: add main monitor settings to dual	2024-05-26 01:59:26 -04:00
wyj	23467523ed	Merge branches 'upstream-hidpi' and 'upstream-custom' into dev	2024-05-26 01:48:19 -04:00
wyj	d01229183c	fix: kitty-dropterm	2024-05-26 01:44:50 -04:00
wyj	20643e9048	update: change default animation	2024-05-26 01:30:03 -04:00
wyj	8828e93f78	update: add an empty line in custum.conf	2024-05-26 01:26:57 -04:00
wyj	50e0fca95c	Merge branch 'upstream-custom' into dev	2024-05-26 01:18:34 -04:00
wyj	e01895d286	update: use us keyboad layout	2024-05-26 01:11:33 -04:00
wyj	6a943e7e61	Merge branch 'upstream-custom' into dev	2024-05-26 00:53:54 -04:00
wyj	985b12cc6e	update: wazbar	2024-05-26 00:50:57 -04:00
wyj	24f4e6e424	update: use kitty as drop-down term	2024-05-25 14:46:40 -04:00
wyj	dd8866242e	fix: add pyprland to packages	2024-05-23 19:00:19 -04:00
wyj	2a649838a4	Merge branch 'upstream-custom' into dev	2024-05-23 18:21:10 -04:00
wyj	8fc4cb9d9e	feat: add pyprland and term dropdown	2024-05-23 03:18:10 -04:00
wyj	73d4480014	feat: add chrome-flags.conf	2024-05-23 01:35:44 -04:00
wyj	efb387ef14	update: change wallpapers to my own	2024-05-22 00:19:43 -04:00
wyj	9f9ea20ee3	Merge branches 'upstream-custom' and 'zshfish' into dev	2024-05-22 00:13:06 -04:00
wyj	3e99847d8b	update: copy a waybar config	2024-05-22 00:12:43 -04:00
wyj	bc37c0e612	Merge branch 'upstream-custom' into dev	2024-05-21 19:17:57 -04:00
wyj	c1542e026c	update: new colors in fastfetch	2024-05-21 19:16:39 -04:00
wyj	567a892f8b	Merge branch 'upstream-hidpi' into dev	2024-05-18 16:29:10 -04:00
wyj	c99a2809ce	fix: hidpi.sh	2024-05-18 16:28:58 -04:00
wyj	23f8294d48	Merge branch 'upstream-custom' into dev	2024-05-18 00:47:50 -04:00
wyj	dd5a4b76ae	update: float QQ	2024-05-17 13:14:19 -04:00
wyj	63a3e3e222	Merge branch 'upstream-hidpi' into dev	2024-05-17 02:10:30 -04:00
wyj	08096e83ff	update: font size=16 for alacritty	2024-05-17 02:09:53 -04:00
wyj	89623ce4f3	Merge branch 'upstream-hidpi' into dev	2024-05-17 01:59:09 -04:00
wyj	a0f43ada10	fix: patch in ~/dotfiles-versions rather than in repository	2024-05-17 01:46:29 -04:00
wyj	8503665117	Merge branch 'upstream-custom' into dev	2024-05-10 17:05:22 -04:00
wyj	3a49bd1ad7	update: use fastfetch instead of neofetch	2024-05-10 17:05:12 -04:00
wyj	3dac8139fe	Merge branch 'upstream-custom' into dev	2024-05-10 17:03:13 -04:00
wyj	075a5df837	enhence: add fastfetch config	2024-05-10 17:02:55 -04:00
wyj	1e6940e88d	Merge branch 'upstream-custom' into dev	2024-05-08 01:57:08 -04:00
wyj	6500fe1c1a	enhence: add display selection in screenshot	2024-05-07 23:45:52 -04:00
wyj	90c646a8fe	Merge branches 'upstream-hidpi' and 'upstream-custom' into dev	2024-05-05 16:41:45 -04:00
wyj	77b6b90448	Merge branch 'upstream-main' into upstream-custom	2024-05-05 16:40:17 -04:00
wyj	b4a5e4d99c	Merge branch 'upstream-main' into upstream-hidpi	2024-05-05 16:34:49 -04:00
wyj	5c3bb19b01	Merge branch 'upstream-custom' into dev	2024-04-19 14:43:44 -04:00
wyj	149d10a285	update: add some custom packages	2024-04-19 14:43:23 -04:00
wyj	8f7e902f81	Merge branch 'upstream-custom' into dev	2024-04-19 02:49:05 -04:00
wyj	fd46e16738	update: make alacritty auto copy	2024-04-19 02:48:51 -04:00
wyj	3c8149ed0b	Merge branch 'upstream-custom' into dev	2024-04-15 19:53:45 -04:00
wyj	f68578bc48	update: idle... margin in waybar	2024-04-15 19:53:17 -04:00
wyj	c7fbe7c7f5	Merge branch 'upstream-custom' into dev	2024-04-15 13:18:02 -04:00
wyj	d46e796571	update: waybar ram icon	2024-04-15 13:17:46 -04:00
wyj	14a56275eb	update: wifi icon in waybar	2024-04-09 14:16:04 -04:00
wyj	cc4a4fb1c0	Merge branch 'upstream-custom' into dev	2024-04-05 16:20:49 -04:00
wyj	26654d87e9	fix: rofi border radius	2024-04-05 16:20:36 -04:00
wyj	056ffe440f	Merge branch 'fcitx5' into dev	2024-04-05 16:13:32 -04:00
wyj	b9025fbfb1	fix: fcitx5 conf	2024-04-05 16:13:19 -04:00
wyj	d7a50ce2fe	Merge branch 'fcitx5' into dev	2024-04-05 16:07:49 -04:00
wyj	7a4d9f7b21	fix: fcitx5 conf	2024-04-05 16:07:36 -04:00
wyj	2c3ff9e10d	Merge branch 'fcitx5' into dev	2024-04-05 15:50:17 -04:00
wyj	249e71d187	fix: fcitx5 conf	2024-04-05 15:50:00 -04:00
wyj	48eab0a6ab	Merge branch 'fcitx5' into dev	2024-04-05 15:31:39 -04:00
wyj	380b43ea30	new feat: fcitx5 install	2024-04-05 15:31:21 -04:00
wyj	607178e5a2	Merge branch 'upstream-custom' into dev	2024-04-05 02:59:58 -04:00
wyj	ee983e39db	update: waybar tray	2024-04-05 02:59:46 -04:00
wyj	71a63edafa	Merge branch 'upstream-custom' into dev	2024-04-05 01:34:01 -04:00
wyj	18bed6fbdf	update: rofi border-radius and position etc	2024-04-05 01:33:45 -04:00
wyj	091bbbfb1a	Merge branch 'upstream-custom' into dev	2024-04-04 22:12:38 -04:00
wyj	77cd4cf980	minor: space in cpu module in waybar	2024-04-04 05:10:16 -04:00
wyj	f095151882	update: better cpu icon in waybar	2024-04-04 04:52:18 -04:00
wyj	f058ea58f7	Merge branch 'upstream-custom' into dev	2024-04-04 04:45:50 -04:00
wyj	bc227bed49	minor: trail space	2024-04-04 04:44:25 -04:00
wyj	475fbc55cc	update: better battery in waybar	2024-04-04 04:42:52 -04:00
wyj	6a9270c276	Merge branch 'upstream-custom' into dev	2024-04-04 03:17:46 -04:00
wyj	1c96f24b09	update: new battary icons in waybar	2024-04-04 03:17:29 -04:00
wyj	71caefa11a	update: rm volume number from waybar	2024-04-04 02:29:48 -04:00
wyj	4b9812dc7f	update: add notify-sent to volume change	2024-04-04 00:02:50 -04:00
wyj	58966c14c8	Merge branch 'upstream-custom' into dev	2024-04-03 23:52:20 -04:00
wyj	20ce47fa20	update: add ~/.local/bin to PATH in bashrc (for zathura-pywal)	2024-04-03 22:27:27 -04:00
wyj	d2b6c0adcc	Merge branch 'upstream-custom' into dev	2024-04-03 17:32:04 -04:00
wyj	1763d37ee4	update: keep memory in waybar 0.1f	2024-04-03 17:31:32 -04:00
wyj	75759b18c3	Merge branch 'upstream-custom' into dev	2024-04-03 14:34:51 -04:00
wyj	b113e1f81d	update: keep idle-inh...	2024-04-03 14:34:31 -04:00
wyj	a1f6438b3c	Merge branch 'upstream-custom' into dev	2024-04-03 14:29:21 -04:00
wyj	289308a542	update: keep idle-inh...	2024-04-03 14:29:05 -04:00
wyj	87b7bed3fe	Merge branches 'upstream-hidpi' and 'upstream-custom' into dev	2024-04-03 14:23:18 -04:00
wyj	8c2be8fed6	Merge remote-tracking branch 'upstream/main' into upstream-custom	2024-04-03 14:22:56 -04:00
wyj	45214117ef	Merge remote-tracking branch 'upstream/main' into upstream-hidpi	2024-04-03 14:22:34 -04:00
wyj	07c38a02b5	Merge branch 'upstream-custom' into dev	2024-04-03 14:19:44 -04:00
wyj	beb717a961	update: custom waybar	2024-04-03 13:25:27 -04:00
wyj	fdbd7de334	Merge branch 'upstream-hidpi' into dev	2024-04-01 15:42:28 -04:00
wyj	0d4b85956e	fix: sed need -E	2024-04-01 15:42:06 -04:00
wyj	059396985d	Merge branch 'upstream-hidpi' into dev	2024-04-01 15:01:02 -04:00
wyj	8565146242	update: change the non-hidpi default font size in alacritty	2024-04-01 15:00:34 -04:00
wyj	d2a368d166	fix hidpi.sh: echo -e	2024-03-28 20:46:48 -04:00
wyj	c6678dcc96	update hidpi.sh: add finish output	2024-03-28 20:46:48 -04:00
wyj	b6156e3233	fix hidpi.sh	2024-03-28 20:46:48 -04:00
wyj	0da2e83f29	fix hidpi.sh: -i instead of -E	2024-03-28 20:46:48 -04:00
wyj	9f8b285ba3	update hidpi.sh: run always	2024-03-28 20:46:48 -04:00
wyj	671a47f09e	fix bug: missing fi	2024-03-28 20:46:48 -04:00
wyj	51a350c544	Merge branch 'upstream-custom' into dev	2024-03-28 19:30:46 -04:00
wyj	2e985927af	update: add custom blur waybar themes	2024-03-28 19:30:14 -04:00
wyj	8265c9fdea	update: add custom waybar themes	2024-03-28 19:26:19 -04:00
wyj	d28d59b6b8	Merge branch 'upstream-hidpi' into dev merge hidpi support	2024-03-28 13:05:00 -04:00
wyj	c1873060de	update: add custom settings	2024-03-28 13:02:10 -04:00
wyj	943cb53c93	add hidpi in install.sh	2024-03-28 01:45:39 -04:00
wyj	c3bfe46e79	add basic hidpi	2024-03-27 23:17:46 -04:00
				`@@ -0,0 +1 @@`
				`--ozone-platform=wayland --enable-wayland-ime`