Merge branch 'upstream-main' into upstream-hidpi

.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="$HOME/.local/bin/:/usr/lib/ccache/bin/:$PATH"
+export PATH="/usr/lib/ccache/bin/:$PATH"
 
 # -----------------------------------------------------
 # DEVELOPMENT

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "yazi/flavors/tokyo-night.yazi"]
-	path = yazi/flavors/tokyo-night.yazi
-	url = https://github.com/BennyOe/tokyo-night.yazi.git

.install/cleanup.sh

@@ -13,6 +13,24 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
     fi
 fi
 
+# Check for running NetworkManager.service
+if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then
+    echo ":: NetworkManager.service already running."
+else
+    sudo systemctl enable NetworkManager.service
+    sudo systemctl start NetworkManager.service
+    echo ":: NetworkManager.service activated successfully."    
+fi
+
+# Check for running bluetooth.service
+if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then
+    echo ":: bluetooth.service already running."
+else
+    sudo systemctl enable bluetooth.service
+    sudo systemctl start bluetooth.service
+    echo ":: bluetooth.service activated successfully."    
+fi
+
 if [ -d ~/dotfiles/hypr/settings/ ] ;then
     rm -rf ~/dotfiles/hypr/settings
     echo ":: ~/dotfiles/hypr/settings removed."

.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,9 +5,6 @@
 if [ -d ~/dotfiles-versions/$version/alacritty ]; then
     _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/kitty ]; then
-    _installSymLink kitty ~/.config/kitty ~/dotfiles/kitty/ ~/.config
-fi
 if [ -d ~/dotfiles-versions/$version/vim ]; then
     _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
 fi
@@ -40,21 +37,11 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
     _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/eww ]; then
+if [ -d ~/dotfiles-versions/$version/swappy ]; then
     _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config
 fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
     _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
 fi
-if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then
-    _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
-fi
-if [ -d ~/dotfiles-versions/$version/Vimix-hyprcursors ]; then
-    if [ ! -d ~/.local/share/icons ]; then mkdir -pv ~/.local/share/icons; fi
-    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors ~/.local/share/icons/
-fi
-if [ -d ~/dotfiles-versions/$version/ranger ]; then
-    _installSymLink ranger ~/.config/ranger ~/dotfiles/ranger/ ~/.config
-fi
 echo ":: Symbolic links created."
 echo

.install/packages/general-packages.sh

@@ -1,59 +1,65 @@
 packagesPacman=(
     "pacman-contrib"
     "vim"
-    "bat"
-    "fzf"
-    "zsh"
-    "fastfetch"
-    "ranger"
-    "btop"
+    "bluez"
+    "bluez-utils"
     "neovim"
     "wget"
     "unzip"
     "alacritty" 
+    "chromium" 
     "dunst" 
     "starship"
     "mpv" 
     "thunar"
     "nautilus" 
+    "mousepad"
     "noto-fonts" 
     "otf-font-awesome" 
     "ttf-fira-sans" 
     "ttf-fira-code" 
     "ttf-firacode-nerd" 
-    "ttf-firacode-nerd"
     "figlet" 
     "vlc" 
     "eza" 
     "python-pip" 
     "python-psutil" 
     "python-rich" 
+    "python-click" 
     "python-pywal"
+    "python-gobject"
     "pavucontrol" 
     "tumbler" 
     "papirus-icon-theme"
+    "breeze-icons"
+    "polkit-gnome"
+    "brightnessctl"
     "gum"
     "man-pages"
+    "nm-connection-editor"
     "gvfs"
     "xdg-user-dirs"
-#    "xdg-desktop-portal-gtk"
+    "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"
-    "pipewire-pulse"
-    "wireplumber"
+    "blueman"
 );
 
 packagesYay=(
-    "vimix-cursors"
-    "orchis-theme"
+    "bibata-cursor-theme" 
     "trizen"
-    "google-chrome"
+    "pacseek"
 );

.install/packages/hyprland-packages.sh

@@ -3,19 +3,17 @@ packagesPacman=(
     "hyprpaper"
     "hyprlock"
     "hypridle"
-    #    "xdg-desktop-portal-hyprland"
+    "xdg-desktop-portal-hyprland" 
     "waybar" 
     "grim" 
     "slurp"
     "swappy"
     "cliphist"
-    "kitty"
-)
+);
 
 packagesYay=(
-    "pyprland"
     "wlogout"
     "nwg-look"
     "eww"
     "hyprshade"
-)
+);

.install/qtile-dotfiles.sh

@@ -35,7 +35,4 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
     _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
-    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
-fi
 echo ":: Symbolic links created."

.install/templates/keyboard-default.conf

@@ -8,7 +8,7 @@ input {
     kb_model =
     kb_options =
     numlock_by_default = true
-    mouse_refocus = false
+    mouse_refocus=false
     
     # For United States
     # kb_layout = us
@@ -28,7 +28,3 @@ input {
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-
-gestures {
-    workspace_swipe = true
-}

.install/templates/keyboard-laptop.conf

@@ -8,7 +8,7 @@ input {
     kb_model =
     kb_options =
     numlock_by_default = true
-    mouse_refocus = false
+    mouse_refocus=false
     
     # For United States
     # kb_layout = us
@@ -22,14 +22,9 @@ input {
         # natural_scroll = false
 
         # for laptop
-        natural_scroll = true
+        natural_scroll = yes
         middle_button_emulation = true
-        clickfinger_behavior = true
-        disable_while_typing = true
+        clickfinger_behavior = 1  
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-
-gestures {
-    workspace_swipe = true
-}

.install/wallpaper.sh

@@ -5,17 +5,16 @@ echo -e "${GREEN}"
 figlet "Wallpapers"
 echo -e "${NONE}"
 if [ ! -d ~/wallpaper ]; then
-    echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?"
+    echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
     echo "If not, the script will install 3 default wallpapers in ~/wallpaper/"
     echo ""
     if gum confirm "Do you want to download the repository?" ;then
-        # wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
-        # unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
-        # if [ ! -d ~/wallpaper/ ]; then
-        #     mkdir ~/wallpaper
-        # fi
-        # cp ~/Downloads/wallpaper-main/* ~/wallpaper/
-        git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/wallpaper
+        wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
+        unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
+        if [ ! -d ~/wallpaper/ ]; then
+            mkdir ~/wallpaper
+        fi
+        cp ~/Downloads/wallpaper-main/* ~/wallpaper/
         echo "Wallpapers from the repository installed successfully."
     elif [ $? -eq 130 ]; then
         exit 130

.settings/browser.sh

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

.settings/editor.sh

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

.settings/networkmanager.sh

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

.settings/rofi-border-radius.rasi

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

.settings/rofi-border.rasi

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

.settings/software.sh

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

.settings/terminal.sh

@@ -1 +1 @@
-kitty
+alacritty

.version/name

@@ -1 +1 @@
-2.9.1.2
+2.9.1.1

.version/version

@@ -1 +1 @@
-2912
+2911

CHANGELOG.md

@@ -1,11 +1,3 @@
-Version 2.9.1.2
-https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
---------------------------------------------------------
-- Workspaces module in waybar updated to enable scroll to change the workspace https://gitlab.com/stephan-raabe/dotfiles/-/merge_requests/114
-- More functions deactivated in Game Mode (SUPER+ALT+G)
-- Keybindings rofi menu updated with keybinding description. Open with right mouse click on Apps waybar module
-- Fixed bug of ML4W Hyprland Settings App with Hyprland 0.41.0
-
 Version 2.9.1.1
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
 --------------------------------------------------------

README.md

@@ -1,4 +1,4 @@
-# ML4W Dotfiles 2.9.1.2
+# ML4W Dotfiles 2.9.1.1
 
 An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
 
@@ -55,8 +55,6 @@ THANK YOU very much for all your support, contributions and ideas:
 - Don Williams: https://github.com/dwilliam62
 - Teodor Orzechowski: https://gitlab.com/sq6gtt
 - Jamie Deppeler: https://gitlab.com/bknight2k
-- Yingjie Wang: https://gitlab.com/GaugeAndGravity
-- Daniel Gerber: https://gitlab.com/dan.john.gerber
 - https://gitlab.com/muee
 
 and many more...

Vimix-hyprcursors/manifest.hl

@@ -1,4 +0,0 @@
-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"
@@ -9,8 +9,5 @@ style = "Regular"
 opacity = 0.7
 
 [window.padding]
-x = 0
-y = 0
-
-[selection]
-save_to_clipboard = true
+x = 15
+y = 15

chrome-flags.conf

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

fastfetch/config.jsonc

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

hypr/conf/animation.conf

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/animations-high.conf
+source = ~/dotfiles/hypr/conf/animations/default.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,2 +1 @@
-exec-once = hyprctl setcursor Vimix-hyprcursors 24
-env = HYPRCURSOR_THEME,Vimix-hyprcursors
+exec-once = hyprctl setcursor Bibata-Modern-Ice 24

hypr/conf/decoration.conf

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

hypr/conf/decorations/custom.conf

@@ -1,31 +0,0 @@
-# ----------------------------------------------------- 
-# 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
-
-    shadow {
-        enabled = true
-        range = 30
-        render_power = 3
-        color = 0x66000000
-    }
-    #drop_shadow = true
-    #shadow_range = 30
-    #shadow_render_power = 3
-    #col.shadow = 0x66000000
-}

hypr/conf/environments/default.conf

@@ -6,7 +6,6 @@
 env = XDG_SESSION_TYPE,wayland
 env = XDG_SESSION_DESKTOP,Hyprland
 env = QT_QPA_PLATFORM,wayland
-env = QT_QPA_PLATFORMTHEME,qt6ct
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = MOZ_ENABLE_WAYLAND,1

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/custom.conf
+source = ~/dotfiles/hypr/conf/keybindings/default.conf

hypr/conf/keybindings/custom.conf

@@ -1,104 +0,0 @@
-# -----------------------------------------------------
-# 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 SHIFT, F, fullscreen, 1
-bind = $mainMod CTRL SHIFT, F, fullscreen, 2
-bind = $mainMod ALT, F, fakefullscreen
-bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
-bind = $mainMod, T, togglefloating
-bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
-bind = $mainMod, J, togglesplit
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-bind = $mainMod SHIFT, right, resizeactive, 100 0
-bind = $mainMod SHIFT, left, resizeactive, -100 0
-bind = $mainMod SHIFT, up, resizeactive, 0 -100
-bind = $mainMod SHIFT, down, resizeactive, 0 100
-bind = $mainMod, G, togglegroup
-bind = $mainMod CTRL, Tab, changegroupactive, f
-
-# 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

hypr/conf/keybindings/default.conf

@@ -7,88 +7,90 @@
 $mainMod = SUPER
 
 # Applications
-bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh # Open the terminal
-bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh # Open the browser
-bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh # Open the filemanager
+bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
+bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
 
 # Windows
-bind = $mainMod, Q, killactive # Kill active window
-bind = $mainMod, F, fullscreen # Set active window to fullscreen
-bind = $mainMod, T, togglefloating # Toggle active windows into floating mode
-bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh # Toggle all windows into floating mode
-bind = $mainMod, J, togglesplit # Toggle split
-bind = $mainMod, left, movefocus, l # Move focus left
-bind = $mainMod, right, movefocus, r # Move focus right
-bind = $mainMod, up, movefocus, u # Move focus up
-bind = $mainMod, down, movefocus, d # Move focus down
-bindm = $mainMod, mouse:272, movewindow # Move window with the mouse
-bindm = $mainMod, mouse:273, resizewindow # Resize window with the mouse
-bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard
-bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard
-bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard
-bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard
-bind = $mainMod, G, togglegroup # Toggle window group
+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 SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh # Toggle animations
-bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh # Take a screenshot
-bind = $mainMod CTRL, Q, exec, wlogout # Start wlogout
-bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh # Change the wallpaper
-bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select # Open wallpaper selector
-bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i # Open application launcher
-bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh # Show keybindings
-bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh # Reload waybar
-bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh # Toggle waybar
-bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh # Reload hyprland config
-bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh # Open clipboard manager
-bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh # Open waybar theme switcher
-bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
-bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh # Toggle screenshader
-bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh # Toggle game mode
+bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh
+bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
+bind = $mainMod CTRL, Q, exec, wlogout
+bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
+bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
+bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
+bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
+bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
+bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
+bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
+bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
+bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
+bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
+bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
+bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+bind = $mainMod CTRL, P, exec, hyprpicker -a
+bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
+bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh
 
 # Workspaces
-bind = $mainMod, 1, workspace, 1 # Open workspace 1
-bind = $mainMod, 2, workspace, 2 # Open workspace 2
-bind = $mainMod, 3, workspace, 3 # Open workspace 3
-bind = $mainMod, 4, workspace, 4 # Open workspace 4
-bind = $mainMod, 5, workspace, 5 # Open workspace 5
-bind = $mainMod, 6, workspace, 6 # Open workspace 6
-bind = $mainMod, 7, workspace, 7 # Open workspace 7
-bind = $mainMod, 8, workspace, 8 # Open workspace 8
-bind = $mainMod, 9, workspace, 9 # Open workspace 9
-bind = $mainMod, 0, workspace, 10 # Open workspace 10
-bind = $mainMod SHIFT, 1, movetoworkspace, 1 # Move active window to workspace 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2 # Move active window to workspace 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3 # Move active window to workspace 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4 # Move active window to workspace 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5 # Move active window to workspace 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6 # Move active window to workspace 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7 # Move active window to workspace 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8 # Move active window to workspace 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9 # Move active window to workspace 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Move active window to workspace 10
-bind = $mainMod, mouse_down, workspace, e+1 # Open next workspace
-bind = $mainMod, mouse_up, workspace, e-1 # Open previous workspace
-bind = $mainMod CTRL, down, workspace, empty # Open the next empty workspace
-
-# Passthrough SUPER KEY to Virtual Machine
-bind = $mainMod, P, submap, passthru # Passthrough SUPER key to virtual machine
-submap = passthru
-bind = SUPER, Escape, submap, reset # Get SUPER key back from virtual machine
-submap = reset
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+bind = $mainMod CTRL, down, workspace, empty
 
 # Fn keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% # Increase brightness by 10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- # Reduce brightness by 10%
-bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% # Increase volume by 5%
-bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% # Reduce volume by 5%
-bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle # Toggle mute
-bind = , XF86AudioPlay, exec, playerctl play-pause # Audio play pause
-bind = , XF86AudioPause, exec, playerctl pause # Audio pause
-bind = , XF86AudioNext, exec, playerctl next # Audio next
-bind = , XF86AudioPrev, exec, playerctl previous # Audio previous
-bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle # Toggle microphone
-bind = , XF86Calculator, exec, qalculate-gtk # Open calculator
-bind = , XF86Lock, exec, hyprlock # Open screenlock
-bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
+bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
+bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
+bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
+bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
+bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bind = , XF86AudioPlay, exec, playerctl play-pause
+bind = , XF86AudioPause, exec, playerctl pause
+bind = , XF86AudioNext, exec, playerctl next
+bind = , XF86AudioPrev, exec, playerctl previous
+bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
+bind = , XF86Calculator, exec, qalculate-gtk
+bind = , XF86Lock, exec, hyprlock
+bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh
 
+# Passthrough SUPER KEY to Virtual Machine
+bind = $mainMod, P, submap, passthru
+submap = passthru
+bind = SUPER, Escape, submap, reset
+submap = reset

hypr/conf/keyboard.conf

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

hypr/conf/layouts/default.conf

@@ -8,6 +8,7 @@ dwindle {
 }
 
 master {
+    new_is_master = true
 }
 
 gestures {

hypr/conf/layouts/laptop.conf

@@ -12,12 +12,5 @@ master {
 }
 
 gestures {
-  workspace_swipe=true
-  workspace_swipe_fingers=3
-  workspace_swipe_distance=400
-  workspace_swipe_invert=true
-  workspace_swipe_min_speed_to_force=30
-  workspace_swipe_cancel_ratio=0.5
-  workspace_swipe_create_new=true
-  workspace_swipe_forever=true
+    workspace_swipe = true
 }

hypr/conf/misc.conf

@@ -5,7 +5,4 @@
 misc {
     disable_hyprland_logo = true
     disable_splash_rendering = true
-    enable_swallow = true
-    swallow_regex = ^(Alacritty|kitty|thunar)$
-    font_family = FiraCode Nerd Font
 }

hypr/conf/ml4w.conf

@@ -22,9 +22,9 @@ windowrulev2 = float,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = size 400 500,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = move 10% 20%,class:(ml4w-dotfiles-settings.py)
 
-windowrulev2 = float,class:(com.ml4w.hyprland.settings)
-windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
-windowrulev2 = center,class:(com.ml4w.hyprland.settings)
+windowrulev2 = float,class:(com.ml4w.hyprlandsettings)
+windowrulev2 = size 700 600,class:(com.ml4w.hyprlandsettings)
+windowrulev2 = center,class:(com.ml4w.hyprlandsettings)
 
 windowrulev2 = float,class:(ml4w-hyprland-settings.py)
 windowrulev2 = size 700 600,class:(ml4w-hyprland-settings.py)
@@ -37,3 +37,4 @@ windowrulev2 = center,class:(dotfiles-floating)
 env = APPIMAGELAUNCHER_DISABLE,1
 env = XCURSOR_SIZE,24
 env = XDG_CURRENT_DESKTOP,Hyprland
+

hypr/conf/monitors/4k.conf

@@ -3,8 +3,4 @@
 # 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
+monitor=,preferred,auto,2

hypr/conf/windowrule.conf

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

hypr/conf/windowrules/custom.conf

@@ -1,24 +0,0 @@
-# -----------------------------------------------------
-# 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-oss)$
-windowrule = opacity 0.75, ^(code-url-handler)$
-windowrule = float,^(QQ)$
-windowrule = float,^(wechat)$
-windowrule = float,^(fdm)$
-windowrule = float,^(xdg-desktop-portal-gtk)$

hypr/conf/windows/default.conf

@@ -6,17 +6,8 @@
 general {
     gaps_in = 10
     gaps_out = 14
-    border_size = 2
+    border_size = 3
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
 }
-
-group {
-    col.border_active = $color11
-    col.border_inactive = rgba(ffffffff)
-    groupbar {
-        col.active = $color11
-        col.inactive = $color13
-    }
-}

hypr/pyprland.toml

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

hypr/scripts/gamemode.sh

@@ -7,18 +7,13 @@
 #
 
 if [ -f ~/.cache/gamemode ] ;then
-    hyprctl reload
+    hyprctl keyword animations:enabled true
+    hyprctl keyword decoration:blur:enabled true
     rm ~/.cache/gamemode
     notify-send "Gamemode deactivated" "Animations and blur enabled"
 else
-    hyprctl --batch "\
-        keyword animations:enabled 0;\
-        keyword decoration:drop_shadow 0;\
-        keyword decoration:blur:enabled 0;\
-        keyword general:gaps_in 0;\
-        keyword general:gaps_out 0;\
-        keyword general:border_size 1;\
-        keyword decoration:rounding 0"
-	touch ~/.cache/gamemode
+    hyprctl keyword animations:enabled false
+    hyprctl keyword decoration:blur:enabled false
+    touch ~/.cache/gamemode
     notify-send "Gamemode activated" "Animations and blur disabled"
 fi

hypr/scripts/gtk.sh

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

hypr/scripts/keybindings.sh

@@ -21,29 +21,13 @@ config_file=${config_file/source=~/}
 config_file="/home/$USER$config_file"
 echo "Reading from: $config_file"
 
-keybinds=""
-
-# Detect Start String
-while read -r line
-do
-    if [[ "$line" == "bind"* ]]; then
-
-        line="$(echo "$line" | sed 's/$mainMod/SUPER/g')"
-        line="$(echo "$line" | sed 's/bind = //g')"
-        line="$(echo "$line" | sed 's/bindm = //g')"
-
-        IFS='#' 
-        read -a strarr <<<"$line" 
-        kb_str=${strarr[0]}
-        cm_str=${strarr[1]}
-
-        IFS=',' 
-        read -a kbarr <<<"$kb_str" 
-
-        item="${kbarr[0]}  + ${kbarr[1]}"$'\r'"${cm_str:1}"
-        keybinds=$keybinds$item$'\n'
-    fi 
-done < "$config_file"
-
+# ----------------------------------------------------- 
+# Parse keybindings
+# ----------------------------------------------------- 
+keybinds=$(grep -oP '(?<=bind = ).*' $config_file)
+keybinds=$(echo "$keybinds" | sed 's/$mainMod/SUPER/g'| sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g')
+# ----------------------------------------------------- 
+# Show keybindings in rofi
+# ----------------------------------------------------- 
 sleep 0.2
-rofi -dmenu -i -markup -eh 2 -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
+rofi -dmenu -i -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"

hypr/scripts/screenshot.sh

@@ -14,11 +14,10 @@ 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\n$option4"
+options="$option2\n$option3"
 
-choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 3 -width 30 -p "Take Screenshot")
+choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 2 -width 30 -p "Take Screenshot")
 
 case $choice in
     $option2)
@@ -34,12 +33,4 @@ 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

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

@@ -1,25 +0,0 @@
-font_family      Fira Code Nerd Font
-font_size        16.0
-bold_font        auto
-italic_font      auto
-bold_italic_font auto
-
-background_opacity 0.7
-
-confirm_os_window_close 0
-
-selection_foreground #000000
-selection_background #F5FBFF
-
-detect_urls    yes
-copy_on_select clipboard
-strip_trailing_spaces smart
-rectangle_select_modifiers ctrl+alt
-terminal_select_modifiers shift
-
-enable_audio_bell no
-
-remember_window_size no
-window_padding_width 5
-
-map ctrl+super+enter    launch --cwd=current