Merge branch 'upstream-custom' into dev

merge hidpi support

.bashrc

@@ -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

.install/cleanup.sh

@@ -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."

.install/fcitx5.sh

@@ -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

.install/hidpi.sh

@@ -0,0 +1,17 @@
+
+# ------------------------------------------------------
+# 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\n# hidpi scale\nsource = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/conf/custom.conf
+    sed -i -E 's/1/2/' ~/dotfiles-versions/$version/hypr/conf/monitors/default.conf
+    echo ":: finished hidpi patch."
+fi

.install/hyprland-dotfiles.sh

@@ -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,11 @@ 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
+    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors
+fi
 echo ":: Symbolic links created."
 echo

.install/packages/general-packages.sh

@@ -1,65 +1,57 @@
 packagesPacman=(
     "pacman-contrib"
     "vim"
-    "bluez"
+    "bat"
-    "bluez-utils"
+    "fzf"
+    "zsh"
+    "fastfetch"
+    "ranger"
+    "btop"
     "neovim"
     "wget"
     "unzip"
     "alacritty"
-    "chromium" 
     "dunst"
     "starship"
     "mpv"
     "thunar"
     "nautilus"
-    "mousepad"
     "noto-fonts"
     "otf-font-awesome"
     "ttf-fira-sans"
     "ttf-fira-code"
     "ttf-firacode-nerd"
+    "ttf-firacode-nerd"
     "figlet"
     "vlc"
     "eza"
     "python-pip"
     "python-psutil"
     "python-rich"
-    "python-click" 
     "python-pywal"
-    "python-gobject"
     "pavucontrol"
     "tumbler"
     "papirus-icon-theme"
-    "breeze-icons"
-    "polkit-gnome"
-    "brightnessctl"
     "gum"
     "man-pages"
-    "nm-connection-editor"
     "gvfs"
     "xdg-user-dirs"
     "xdg-desktop-portal-gtk"
-    "networkmanager"
-    "network-manager-applet"
     "xarchiver"
     "thunar-archive-plugin"
     "zip"
     "fuse2"
-    "gtk4"
-    "libadwaita"
     "xdg-desktop-portal"
     "qalculate-gtk"
     "imagemagick"
-    "guvcview"
     "jq"
     "rofi-wayland"
     "fastfetch"
-    "blueman"
 );
 
 packagesYay=(
-    "bibata-cursor-theme" 
+    "vimix-cursors"
+    "orchis-theme"
     "trizen"
-    "pacseek"
+    "google-chrome"
 );

.install/packages/hyprland-packages.sh

@@ -9,9 +9,11 @@ packagesPacman=(
     "slurp"
     "swappy"
     "cliphist"
+    "kitty"
 );
 
 packagesYay=(
+    "pyprland"
     "wlogout"
     "nwg-look"
     "eww"

.install/qtile-dotfiles.sh

@@ -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."

.install/wallpaper.sh

@@ -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
+        # wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
-        unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
+        # unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
-        if [ ! -d ~/wallpaper/ ]; then
+        # if [ ! -d ~/wallpaper/ ]; then
-            mkdir ~/wallpaper
+        #     mkdir ~/wallpaper
-        fi
+        # fi
-        cp ~/Downloads/wallpaper-main/* ~/wallpaper/
+        # 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

.settings/browser.sh

@@ -1 +1 @@
-chromium
+google-chrome-stable

.settings/editor.sh

@@ -1 +1 @@
-mousepad
+~/dotfiles/.settings/terminal.sh -e vim

.settings/networkmanager.sh

@@ -1 +0,0 @@
-nm-connection-editor

.settings/rofi-border-radius.rasi

@@ -0,0 +1,3 @@
+* {
+    border-radius:  15px;
+}

.settings/rofi-border.rasi

@@ -1 +1,3 @@
-* { border-width: 3px; }
+* {
+    border-width:   2px;
+}

.settings/software.sh

@@ -1 +0,0 @@
-alacritty -e pacseek

Vimix-hyprcursors/manifest.hl

@@ -0,0 +1,4 @@
+name = Extracted Theme
+description = Automatically extracted with hyprcursor-util
+version = 0.1
+cursors_directory = hyprcursors

alacritty/alacritty.toml

@@ -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

chrome-flags.conf

@@ -0,0 +1 @@
+--ozone-platform=wayland --enable-wayland-ime

fastfetch/config.jsonc

@@ -1,110 +1,165 @@
-//  Thanks to Bina
+// Note that you must replace the image path to an existing image to display it.
+
 {
-  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-  "logo": {
+    // "logo": {
-      "padding": {
+    //     "type": "iterm",
-      "top": 2
+    //     "source": "/Users/carter/Desktop/apple1.png",
-      }
+    //     "width": 28,
-  },
+    //     "height": 12
-  "display": {
+    // },
-        "separator": " ➜  "
+    "display": {
-  },
+    //    "separator": "  "
-  "modules": [
+        "separator": " "
-      "break",
+    },
-      "break",
+    "modules": [
-      "break",
+        {
-       {
+            "type": "host",
-          "type": "os",
+            "key": "╭─󰌢",
-          "key": "OS   ",
+            "keyColor": "green"
-          "keyColor": "31",  // = color1
+        },
-      },
+        {
-      {
+            "type": "cpu",
-          "type": "kernel",
+            "key": "├─󰻠",
-          "key": " ├  ",
+            "keyColor": "green"
-          "keyColor": "31",
+        },
-      },
+        {
-      {
+            "type": "gpu",
-          "type": "packages",
+            "key": "├─󰍛",
-          "format": "{} (pacman)",
+            "keyColor": "green"
-          "key": " ├ 󰏖 ",
+        },
-          "keyColor": "31",  
+        {
-      },
+            "type": "disk",
-      {
+            "key": "├─",
-          "type": "shell",
+            "keyColor": "green"
-          "key": " └  ",
+        },
-          "keyColor": "31", 
+        {
-      },
+            "type": "memory",
-      "break",
+            "key": "├─󰑭",
-      {
+            "keyColor": "green"
-          "type": "wm",
+        },
-          "key": "WM   ",
+        {
-          "keyColor": "32", 
+            "type": "swap",
-      },
+            "key": "├─󰓡",
-      {
+            "keyColor": "green"
-          "type": "wmtheme",
+        },
-          "key": " ├ 󰉼 ",
+        {
-          "keyColor": "32",
+            "type": "display",
-      },
+            "key": "├─󰍹",
-      {
+            "keyColor": "green"
-          "type": "icons",
+        },
-          "key": " ├ 󰀻 ",
+        {
-          "keyColor": "32",
+            "type": "battery",
-      },
+            "key": "├─",
-      {
+            "keyColor": "green"
-          "type": "cursor",
+        },
-          "key": " ├  ",
+        {
-          "keyColor": "32", 
+            "type": "poweradapter",
-      },
+            "key": "├─",
-      {
+            "keyColor": "green"
-          "type": "terminal",
+        },
-          "key": " ├  ",
+        {
-          "keyColor": "32",
+            "type": "gamepad",
-      },
+            "key": "├─",
-      {
+            "keyColor": "green"
-          "type": "terminalfont",
+        },
-          "key": " └  ",
+        {
-          "keyColor": "32", 
+            "type": "bluetooth",
-      },
+            "key": "├─",
-      "break",
+            "keyColor": "green"
-      {
+        },
-          "type": "host",
+        {
-          "format": "{5} {1} Type {2}",
+            "type": "sound",
-          "key": "PC   ",
+            "key": "╰─",
-          "keyColor": "33",
+            "keyColor": "green"
-      },
+        },
-      {
+        "break",
-          "type": "cpu",
+
-          "format": "{1} ({3}) @ {7} GHz",
+        {
-          "key": " ├  ",
+            "type": "shell",
-          "keyColor": "33",
+            "key": "╭─",
-      },
+            "keyColor": "yellow"
-      {
+        },
-          "type": "gpu",
+        {
-          "format": "{1} {2} @ {12} GHz",            
+            "type": "terminal",
-          "key": " ├ 󰢮 ",
+            "key": "├─",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      {
+        {
-          "type": "memory",
+            "type": "terminalfont",
-          "key": " ├  ",
+            "key": "├─",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      {
+        {
-          "type": "swap",
+            "type": "lm",
-          "key": " ├ 󰓡 ",
+            "key": "├─󰧨",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      {
+        {
-          "type": "disk",
+            "type": "de",
-          "key": " ├ 󰋊 ",
+            "key": "├─",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      {
+        {
-          "type": "monitor",
+            "type": "wm",
-          "key": " └  ",
+            "key": "├─",
-          "keyColor": "33",
+            "keyColor": "yellow"
-      },
+        },
-      "break",
+        {
-      "break",
+            "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󱓻"
+        }
+    ]
 }
+

hypr/conf/animation.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/default.conf
+source = ~/dotfiles/hypr/conf/animations/animations-high.conf

hypr/conf/autostart.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

hypr/conf/cursor.conf

@@ -1 +1 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+exec-once = hyprctl setcursor Vimix 24

hypr/conf/decoration.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/decorations/default.conf
+source = ~/dotfiles/hypr/conf/decorations/custom.conf

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
+}

hypr/conf/fcitx5.conf

@@ -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

hypr/conf/hidpi.conf

@@ -0,0 +1,6 @@
+xwayland {
+  force_zero_scaling = true
+}
+
+env = GDK_SCALE,2
+env = QT_SCALE_FACTOR=2

hypr/conf/keybinding.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/keybindings/default.conf
+source = ~/dotfiles/hypr/conf/keybindings/custom.conf

hypr/conf/keybindings/custom.conf

@@ -0,0 +1,97 @@
+# ----------------------------------------------------- 
+# 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, period, 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 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 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
+
+# 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

hypr/conf/keybindings/default.conf

@@ -40,7 +40,6 @@ 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

hypr/conf/keyboard.conf

@@ -3,7 +3,7 @@
 # https://wiki.hyprland.org/Configuring/Variables/#input
 # -----------------------------------------------------
 input {
-    kb_layout = de
+    kb_layout = us
     kb_variant =
     kb_model =
     kb_options =
@@ -11,7 +11,9 @@ input {
     follow_mouse = 1
     mouse_refocus=false
     touchpad {
-        natural_scroll = false
+        natural_scroll = true
+        disable_while_typing=true
+        tap-to-click=true
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }

hypr/conf/layouts/laptop.conf

@@ -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
 }

hypr/conf/misc.conf

@@ -5,4 +5,6 @@
 misc {
     disable_hyprland_logo = true
     disable_splash_rendering = true
+    enable_swallow = true
+    swallow_regex = ^(Alacritty)$
 }

hypr/conf/monitors/4k.conf

@@ -0,0 +1,6 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+monitor=,preferred,auto,2

hypr/conf/monitors/dual.conf

@@ -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

hypr/conf/windowrule.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/windowrules/default.conf
+source = ~/dotfiles/hypr/conf/windowrules/custom.conf

hypr/conf/windowrules/custom.conf

@@ -0,0 +1,19 @@
+# ----------------------------------------------------- 
+# 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 = float,^(QQ)$

hypr/conf/windows/default.conf

@@ -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

hypr/pyprland.toml

@@ -0,0 +1,12 @@
+[pyprland]
+
+plugins = [
+  "scratchpads",
+  "magnify",
+]
+
+[scratchpads.term]
+animation = "fromTop"
+command = "kitty --class kitty-dropterm"
+class = "kitty-dropterm"
+size = "75% 60%"

hypr/scripts/screenshot.sh

@@ -14,10 +14,11 @@ NAME="screenshot_$(date +%d%m%Y_%H%M%S).png"
 
 option2="Selected area"
 option3="Fullscreen (delay 3 sec)"
+option4="Current display (delay 3 sec)"
 
-options="$option2\n$option3"
+options="$option2\n$option3\n$option4"
 
-choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 2 -width 30 -p "Take Screenshot")
+choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 3 -width 30 -p "Take Screenshot")
 
 case $choice in
     $option2)
@@ -33,4 +34,12 @@ case $choice in
         notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
         swappy -f "$DIR$NAME"
     ;;
+    $option4)
+        sleep 3
+        monitor="$(hyprctl monitors | awk '/Monitor/{monitor=$2} /focused: yes/{print monitor; exit}')"
+        grim -o "$monitor" "$DIR$NAME"
+        xclip -selection clipboard -t image/png -i "$DIR$NAME"
+        notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
+        swappy -f "$DIR$NAME"
+    ;;
 esac

install.sh

@@ -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

kitty/kitty.conf

@@ -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

rofi/config-cliphist.rasi

@@ -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;
 }
 

rofi/config-compact.rasi

@@ -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;
 }
 

rofi/config-power.rasi

@@ -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;
 }
 

rofi/config-screenshot.rasi

@@ -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;
 }
 

rofi/config-short.rasi

@@ -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;
 }
 

rofi/config-themes.rasi

@@ -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;
 }
 

rofi/config-wallpaper.rasi

@@ -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;
@@ -155,6 +157,7 @@ listview {
     fixed-columns:               true;
     background-color:             @background;
     border:                       0px;
+    border-radius:                0px;
 }
 
 /* ---- Element ---- */
@@ -164,7 +167,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
     orientation:                  vertical;
 }

rofi/config.rasi

@@ -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;
 }
 

scripts/filemanager.sh

@@ -1 +0,0 @@
-thunar

scripts/installtimeshift.sh

@@ -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

scripts/installupdates.sh

@@ -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

scripts/onedrive.sh

@@ -1,12 +0,0 @@
-#   ___             ____       _            
-#  / _ \ _ __   ___|  _ \ _ __(_)_   _____  
-# | | | | '_ \ / _ \ | | | '__| \ \ / / _ \ 
-# | |_| | | | |  __/ |_| | |  | |\ V /  __/ 
-#  \___/|_| |_|\___|____/|_|  |_| \_/ \___| 
-#                                           
-#  
-# by Stephan Raabe (2023) 
-# ----------------------------------------------------- 
-
-rclone --vfs-cache-mode writes mount OneDrive: ~/OneDrive &
-notify-send "OneDrive connected" "Microsoft OneDrive successfully mounted."