Merge branch 'dev' into 'main'

Merge 2.8.1RC2

See merge request stephan-raabe/dotfiles!71

.install/backup.sh

@@ -36,6 +36,8 @@ echo -e "${NONE}"
             cp ~/.bashrc ~/dotfiles-versions/backups/$datets/.bashrc-old
             echo ":: Existing .bashrc file found in homefolder. .bashrc-old created"
         fi
+        echo
+        echo ":: PLEASE NOTE: You can create a fresh installation of teh dotfiles by removing the folder ~/dotfiles"
     elif [ $? -eq 130 ]; then
         exit 130
     else

.install/cleanup.sh

@@ -51,6 +51,16 @@ if [ -d ~/dotfiles/hypr/settings/modules/system/swaylock ] ;then
     echo "~/dotfiles/hypr/settings/modules/system/swaylock removed."
 fi
 
+# Remove Swayidle
+if [[ $(_isInstalledPacman "swayidle") == 0 ]]; then
+    sudo pacman --noconfirm -Rns swayidle
+fi
+
+# Remove Swaylock
+if [[ $(_isInstalledYay "swaylock-effects-git") == 0 ]]; then
+    yay --noconfirm -Rns swaylock-effects-git
+fi
+
 # Create default folder structure
 xdg-user-dirs-update
 echo "Default folders created..."

.install/includes/library.sh

@@ -25,7 +25,7 @@ _isInstalledPacman() {
 
 _isInstalledYay() {
     package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
+    check="$(yay -Qs --color always "${package}" | grep "local" | grep "\." | grep "${package} ")";
     if [ -n "${check}" ] ; then
         echo 0; #'0' means 'true' in Bash
         return; #true

.install/packages/hyprland-packages.sh

@@ -4,14 +4,13 @@ packagesPacman=(
     "waybar" 
     "grim" 
     "slurp"
-    "swayidle"
     "swappy"
     "cliphist"
 );
 
 packagesYay=(
     "swww" 
-    "swaylock-effects-git" 
     "wlogout"
     "nwg-look"
+    "emote"
 );

.install/screenlock.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+echo -e "${GREEN}"
+figlet "Screen lock"
+echo -e "${NONE}"
+if [[ $(_isInstalledYay "hypridle-git") == 1 ]] || [[ $(_isInstalledYay "hyprlock-git") == 1 ]]; then
+    echo "You can install hypridle and hyprlock lock your screen automatically."
+    if gum confirm "Do you want to install hypridle and hyprlock?" ;then
+        yay --noconfirm -S hypridle-git hyprlock-git
+    fi
+else
+    echo ":: hypridle and hyprlock are already installed."
+fi
+echo

.install/templates/keyboard.conf

@@ -7,6 +7,7 @@ input {
     kb_variant = 
     kb_model =
     kb_options =
+    numlock_by_default = true
     
     # For United States
     # kb_layout = us

.settings/swayidle.sh

@@ -1,2 +0,0 @@
-timeswaylock=600
-timeoff=660

.version/name

@@ -1 +1 @@
-2.8.1RC1
+2.8.1RC2

CHANGELOG

@@ -2,9 +2,12 @@ Version 2.8.1
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8
 --------------------------------------------------------
 General:
+- Swayidle replaced with hypridle (config in dotfiles/hypr/hypridle.conf)
+- Swaylock replaced with hyprlock (config in dotfiles/hypr/hyprlock.conf)
 - New default wallpaper in Hyprland style
 - xarchiver and zip added for thunar
 - Rofi border width can be adjusted in dotfiles/.settings/rofi-border.rasi
+- emote added to select Emojis (SUPER+.)
 
 ML4W Welcome App: 
 - Opens Hyprland systeminfo from the about menu

README.md

@@ -1,4 +1,4 @@
-# ML4W dotfiles 2.8.1 RC1
+# ML4W dotfiles 2.8.1 RC2
 
 This is my configuration of Hyprland (Wayland) and Qtile (X11) for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
 
@@ -97,6 +97,8 @@ git stash; git pull
 
 ```
 
+You can create a clean reinstallation by removing the folder ~/dotfiles Please note that you can create a backup of your exsiting configuration with the backup feature of the install script. It's recommended to remove the folder ~/dotfiles only after creating a backup. 
+
 ## Dotfiles Installer
 
 You can also use the dotfiles installer script to download and install the latest release: https://gitlab.com/stephan-raabe/installer
@@ -271,7 +273,8 @@ Please note that every Arch Linux system is different and I cannot guarantee tha
 - Screenshots: grim & slurp
 - Clipboard Manager: cliphist
 - Logout: wlogout 
-- Screenlock: swaylock-effects
+- Idle Manager: hypridle
+- Screenlock: hyprlock
 
 # Qtile X11
 
@@ -334,6 +337,14 @@ sudo systemctl disable sddm.service
 sudo rm /etc/systemd/system/display-manager.service
 ```
 
+## Waybar is not loading
+
+There could be a conflict with xdg-desktop-portal-gtk. Please try to remove the package if installed with:
+
+```
+sudo pacman -R xdg-desktop-portal-gtk
+```
+
 # Wallpaper repository
 
 You can find my wallpaper collection in the repository https://gitlab.com/stephan-raabe/wallpaper

hypr/conf/autostart.conf

@@ -14,8 +14,9 @@ exec-once = dunst
 # Load GTK settings
 exec-once = ~/dotfiles/hypr/scripts/gtk.sh
 
-# Load swayidle and define the lock screen time
+# Using hypridle to start hyprlock
-exec-once = ~/dotfiles/hypr/scripts/lockscreentime.sh
+exec-once = hypridle
+# exec-once = swayidle -w timeout 600 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f'
 
 # Load network manager applet
 # START NM APPLET

hypr/conf/keybindings/default.conf

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

hypr/conf/keyboard.conf

@@ -7,7 +7,7 @@ input {
     kb_variant = 
     kb_model =
     kb_options =
-
+    numlock_by_default = true
     follow_mouse = 1
     touchpad {
         natural_scroll = false

hypr/hypridle.conf

@@ -0,0 +1,13 @@
+general {
+    lock_cmd = notify-send "lock!"          # dbus/sysd lock command (loginctl lock-session) 
+    unlock_cmd = notify-send "unlock!"      # same as above, but unlock
+    before_sleep_cmd = notify-send "Zzz"    # command ran before sleep
+    after_sleep_cmd = notify-send "Awake!"  # command ran after sleep
+    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
+}
+
+listener {
+    timeout = 600                            # in seconds
+    on-timeout = hyprlock # command to run when timeout has passed
+    # on-resume = notify-send "Welcome back to your desktop!"  # command to run when activity is detected after timeout has fired.
+}

hypr/hyprlock.conf

@@ -0,0 +1,44 @@
+background {
+    monitor =
+    path = $HOME/dotfiles/.settings/lockscreen.png   # only png supported for now
+    color = rgba(25, 20, 20, 1.0)
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+    blur_passes = 4 # 0 disables blurring
+    blur_size = 2
+    noise = 0.0117
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 200, 50
+    outline_thickness = 1
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgb(000000)
+    inner_color = rgb(200, 200, 200)
+    font_color = rgb(10, 10, 10)
+    fade_on_empty = true
+    placeholder_text = <i>Input Password...</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    position = 0, -20
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = Enter your password to unlock
+    color = rgba(200, 200, 200, 1.0)
+    font_size = 25
+    font_family = Noto Sans
+
+    position = 0, 200
+    halign = center
+    valign = center
+}

hypr/scripts/lockscreentime.sh

@@ -1,21 +0,0 @@
-#/bin/bash
-#  ___    _ _      _   _                 
-# |_ _|__| | | ___| |_(_)_ __ ___   ___  
-#  | |/ _` | |/ _ \ __| | '_ ` _ \ / _ \ 
-#  | | (_| | |  __/ |_| | | | | | |  __/ 
-# |___\__,_|_|\___|\__|_|_| |_| |_|\___| 
-#                                        
-#  
-# by Stephan Raabe (2023) 
-# ----------------------------------------------------- 
-
-# START SWAYIDLE    
-# exit
-# END SWAYIDLE    
-source ~/dotfiles/.settings/swayidle.sh
-if [ -f "/usr/bin/swayidle" ]; then
-    echo "swayidle is installed."
-    swayidle -w timeout $timeswaylock 'swaylock -f' timeout $timeoff 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
-else
-    echo "swayidle not installed."
-fi;

install.sh

@@ -49,6 +49,7 @@ if [[ $profile == *"Hyprland"* ]]; then
     echo -e "${NONE}"
     source .install/packages/hyprland-packages.sh
     source .install/install-packages.sh
+    source .install/screenlock.sh
 fi
 if [[ $profile == *"Qtile"* ]]; then
     echo -e "${GREEN}"

swaylock/config

@@ -1,76 +0,0 @@
-#  ____                     _            _     
-# / ___|_      ____ _ _   _| | ___   ___| | __ 
-# \___ \ \ /\ / / _` | | | | |/ _ \ / __| |/ / 
-#  ___) \ V  V / (_| | |_| | | (_) | (__|   <  
-# |____/ \_/\_/ \__,_|\__, |_|\___/ \___|_|\_\ 
-#                     |___/                    
-#  
-# by Stephan Raabe (2023) 
-# ----------------------------------------------------- 
-
-ignore-empty-password
-font="Fira Sans Semibold"
-
-clock
-timestr=%R
-datestr=%a, %e of %B
-
-# Add current screenshot as wallpaper
-screenshots
-
-# Add an image as a background 
-# image=~/.cache/current_wallpaper.jpg
-
-# Fade in time
-fade-in=1
-
-# Effect for background
-effect-blur=5x2
-# effect-greyscale
-# effect-pixelate=5
-
-# Show/Hide indicator circle
-indicator
-
-# smaller indicator
-indicator-radius=200
-
-# bigger indicator
-# indicator-radius=300
-
-indicator-thickness=20
-indicator-caps-lock
-
-# Define all colors
-
-key-hl-color=00000066
-separator-color=00000000
-
-inside-color=00000033
-inside-clear-color=ffffff00
-inside-caps-lock-color=ffffff00
-inside-ver-color=ffffff00
-inside-wrong-color=ffffff00
-
-ring-color=ffffff
-ring-clear-color=ffffff
-ring-caps-lock-color=ffffff
-ring-ver-color=ffffff
-ring-wrong-color=ffffff
-
-line-color=00000000
-line-clear-color=ffffffFF
-line-caps-lock-color=ffffffFF
-line-ver-color=ffffffFF
-line-wrong-color=ffffffFF
-
-text-color=ffffff
-text-clear-color=ffffff
-text-ver-color=ffffff
-text-wrong-color=ffffff
-
-bs-hl-color=ffffff
-caps-lock-key-hl-color=ffffffFF
-caps-lock-bs-hl-color=ffffffFF
-disable-caps-lock-text
-text-caps-lock-color=ffffff

waybar/modules.json

@@ -369,6 +369,6 @@
             "activated": "",
             "deactivated": ""
         },
-        "on-click-right": "swaylock"        
+        "on-click-right": "hyprlock"        
     }
 }

waybar/themes/starter/modules.json

@@ -324,6 +324,6 @@
             "activated": "",
             "deactivated": ""
         },
-        "on-click-right": "swaylock"        
+        "on-click-right": "hyprlock"        
     }
 }