Merge branch 'dev' into 'main'

Merge Release 2.2

See merge request stephan-raabe/dotfiles!6

.bashrc

@@ -29,6 +29,7 @@ alias wifi='nmtui'
 alias od='~/private/onedrive.sh'
 alias rw='~/dotfiles/waybar/reload.sh'
 alias winclass="xprop | grep 'CLASS'"
+alias dot="cd ~/dotfiles"
 
 # -----------------------------------------------------
 # Window Managers

.deploycheck

@@ -0,0 +1,8 @@
+-------------------------------------------------------
+Checklist for changes on main branch after merging
+-------------------------------------------------------
+
+hyprland.conf: Set monitor to ,preferred,auto,1
+hyprland.conf: Set keyboard to us
+gtk/gtk-3.0: Remove bookmarks
+

.gitignore

@@ -1 +1,2 @@
 __pycache__/
+bookmarks

1-install.sh

@@ -106,6 +106,7 @@ packagesPacman=(
     "tumbler" 
     "xautolock" 
     "blueman"
+    "nautilus"
 );
 
 packagesYay=(
@@ -182,7 +183,7 @@ while true; do
             else
                 mkdir ~/wallpaper
             fi
-            cp ~/dotfiles/default.jpg ~/wallpaper
+            cp ~/dotfiles/wallpapers/* ~/wallpaper
             echo "Default wallpaper installed."
         break;;
         * ) echo "Please answer yes or no.";;
@@ -194,7 +195,7 @@ done
 # ------------------------------------------------------
 echo ""
 echo "-> Init pywal"
-wal -i ~/dotfiles/default.jpg
+wal -i ~/dotfiles/wallpapers/default.jpg
 echo "pywal initiated."
 
 # ------------------------------------------------------

2-install-hyprland.sh

@@ -52,6 +52,7 @@ packagesPacman=(
     "waybar" 
     "grim" 
     "slurp"
+    "swayidle"
 );
 
 packagesYay=(

CHANGELOG

@@ -1,6 +1,26 @@
-Version 2.1
+Version 2.2
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.2
+--------------------------------------------------------
+- Bugfix: /gtk/gtk-3.0/bookmarks removed from repository
+- Bugfix: Added cursor definition to hyprland.conf
+- + more smaller fixes
 
-Bugfixes
+- Login: Move issue into login directory
-Updates custom waybar mdule to check available packages for updates (pacman and aur) plus color theme for number of available packages (waybar/modules.json)
+- Hyprland: Prefer dark theme for gtk3 applications e.g., nautilus
-New installupdates script with Timeshift integration. Ask for name for the Timeshift before starting the updates (scripts/installupdates.sh)
+- Hyprland: Add keybinding for filemanager.sh SUPER, CTRL, F to start nautilus (if installed) or thunar
-Pywal colors for waybar now with relative link into ./cache/wal/ (waybar/style.css)
+- Installation: Add nautilus package to become new default file manager
+- Hyprland install script: Add swayidle to 2-install-hyprland.sh
+- Waybar: Add quickstart icon for filemanager.sh
+- Waybar: Style improvements
+- Dunst: Add white border around notifications
+- wlogout: Add new white icons and optimized style with pywal
+- Hyprland: Add keybind to passthrough SUPERKEY to Virtual Machine
+- Grim: Removed first option in the script for selected window
+
+Version 2.1
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.1
+--------------------------------------------------------
+- Several bugfixes
+- Updates custom waybar module to check available packages for updates (pacman and aur) plus color theme for number of available packages (waybar/modules.json)
+- New installupdates script with Timeshift integration. Ask for name for the Timeshift before starting the updates (scripts/installupdates.sh)
+- Waybar: Pywal colors for waybar now with relative link into ./cache/wal/ (waybar/style.css)

dunst/dunstrc

@@ -43,7 +43,7 @@
     origin = top-center
 
     # Offset from the origin
-    # offset = 8x34
+    offset = 0x30
 
     # Scale factor. It is auto-detected if value is 0.
     scale = 0
@@ -102,7 +102,7 @@
 
     # Defines width in pixels of frame around the notification window.
     # Set to 0 to disable.
-    frame_width = 0
+    frame_width = 3
 
     # Defines color of the frame around the notification window.
     frame_color = "#ffffff"
@@ -260,7 +260,7 @@
     # corners.
     # The radius will be automatically lowered if it exceeds half of the
     # notification height to avoid clipping text and/or icons.
-    corner_radius = 0
+    corner_radius = 10
 
     # Ignore the dbus closeNotification message.
     # Useful to enforce the timeout set by dunst configuration. Without this

gtk/gtk-3.0/settings.ini

@@ -13,3 +13,4 @@ gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull
+gtk-application-prefer-dark-theme=true

hypr/gtk.sh

@@ -9,7 +9,10 @@ gtk_theme="$(grep 'gtk-theme-name' "$config" | sed 's/.*\s*=\s*//')"
 icon_theme="$(grep 'gtk-icon-theme-name' "$config" | sed 's/.*\s*=\s*//')"
 cursor_theme="$(grep 'gtk-cursor-theme-name' "$config" | sed 's/.*\s*=\s*//')"
 font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')"
+
 gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
 gsettings set "$gnome_schema" icon-theme "$icon_theme"
 gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
 gsettings set "$gnome_schema" font-name "$font_name"
+
+gsettings set org.gnome.desktop.interface color-scheme prefer-dark

hypr/hyprland.conf

@@ -18,18 +18,21 @@ env = WLR_RENDERER_ALLOW_SOFTWARE, 1
 # Monitor Setup
 # See https://wiki.hyprland.org/Configuring/Monitors/
 # ----------------------------------------------------- 
-# monitor=,2560x1440@120,auto,1
+monitor=,2560x1440@120,auto,1
-monitor=,preferred,auto,1
+# monitor=,preferred,auto,1
 # monitor=,1920x1080,auto,1
 
 # ----------------------------------------------------- 
 # Autostart
 # ----------------------------------------------------- 
 exec-once = swww init 
-exec-once = ~/dotfiles/waybar/launch.sh
-exec-once = ~/dotfiles/scripts/updatewal-swww.sh
 exec-once = dunst
+exec-once = ~/dotfiles/scripts/lockscreentime.sh
+exec-once = ~/dotfiles/scripts/updatewal-swww.sh
 exec-once = ~/dotfiles/hypr/gtk.sh
+exec-once = ~/dotfiles/waybar/launch.sh
+exec-once = hyprctl setcursor Bibata-Modern-Classic 24
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 
 # ----------------------------------------------------- 
 # Load pywal color file
@@ -147,7 +150,6 @@ bind = $mainMod, F, fullscreen
 bind = $mainMod, E, exec, dolphin
 bind = $mainMod, T, togglefloating
 bind = $mainMod, B, exec, brave
-bind = $mainMod, P, pseudo
 bind = $mainMod, J, togglesplit
 bind = $mainMod, left, movefocus, l
 bind = $mainMod, right, movefocus, r
@@ -160,6 +162,7 @@ bind = $mainMod SHIFT, W, exec, ~/dotfiles/scripts/updatewal-swww.sh
 bind = $mainMod CTRL, W, exec, ~/dotfiles/scripts/wallpaper-swww.sh
 bind = $mainMod CTRL, RETURN, exec, ~/dotfiles/scripts/applauncher.sh
 bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
+bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
 
 bind = $mainMod, 1, workspace, 1
 bind = $mainMod, 2, workspace, 2
@@ -194,6 +197,14 @@ bind = $mainMod SHIFT, left, resizeactive, -100 0
 bind = $mainMod SHIFT, up, resizeactive, 0 -100
 bind = $mainMod SHIFT, down, resizeactive, 0 100
 
+# ----------------------------------------------------- 
+# Passthrough SUPER KEY to Virtual Machine
+# ----------------------------------------------------- 
+bind = $mainMod, P, submap, passthru
+submap = passthru
+bind = SUPER, Escape, submap, reset
+submap = reset
+
 # ----------------------------------------------------- 
 # Misc settings
 # ----------------------------------------------------- 
@@ -201,3 +212,4 @@ misc {
     disable_hyprland_logo = true
     disable_splash_rendering = true
 }
+

polybar/config.ini

@@ -56,7 +56,7 @@ separator = ""
 separator-foreground = ${colors.disabled}
 font-0 = "Fira Sans SemiBold:size=11;2"
 font-1 = "Font Awesome 6 Free Solid:pixelsize=11;2"
-modules-left = appmenu brave outlook teams calculator chatgpt xwindow
+modules-left = appmenu brave chatgpt xwindow
 modules-center = xworkspaces
 modules-right = battery xkeyboard mysystem filesystem pulseaudio memory cpu date exit
 cursor-click = pointer

scripts/filemanager.sh

@@ -0,0 +1,18 @@
+#/bin/sh
+#  _____ _ _                                                   
+# |  ___(_) | ___ _ __ ___   __ _ _ __   __ _  __ _  ___ _ __  
+# | |_  | | |/ _ \ '_ ` _ \ / _` | '_ \ / _` |/ _` |/ _ \ '__| 
+# |  _| | | |  __/ | | | | | (_| | | | | (_| | (_| |  __/ |    
+# |_|   |_|_|\___|_| |_| |_|\__,_|_| |_|\__,_|\__, |\___|_|    
+#                                             |___/            
+#  
+# by Stephan Raabe (2023) 
+# ----------------------------------------------------- 
+
+if [ -f "/usr/bin/nautilus" ]; then
+    echo "nautilus is installed."
+    nautilus --new-window
+else
+    echo "nautilus not installed. Launching thunar instead."
+    thunar
+fi;

scripts/grim.sh

@@ -12,20 +12,14 @@
 DIR="$HOME/Pictures/screenshots/"
 NAME="screenshot_$(date +%d%m%Y_%H%M%S).png"
 
-# option1="Selected window (delay 3 sec)"
 option2="Selected area"
 option3="Fullscreen (delay 3 sec)"
 
-# options="$option1\n$option2\n$option3"
 options="$option2\n$option3"
 
 choice=$(echo -e "$options" | rofi -dmenu -i -no-show-icons -l 4 -width 30 -p "Take Screenshot")
 
 case $choice in
-    $option1)
-        scrot $DIR$NAME -d 3 -e 'xclip -selection clipboard -t image/png -i $f' -c -z -u
-        notify-send "Screenshot created" "Mode: Selected window"
-    ;;
     $option2)
         grim -g "$(slurp)" $(xdg-user-dir PICTURES)/screenshots/$(date +'%s_grim.png')
         notify-send "Screenshot created" "Mode: Selected area"

scripts/installupdates.sh

@@ -84,3 +84,5 @@ echo "-----------------------------------------------------"
 echo ""
 
 yay
+
+notify-send "Update complete" "$updates packages updated successfully"

scripts/launchvm.sh

@@ -9,15 +9,25 @@
 # by Stephan Raabe (2023) 
 # ----------------------------------------------------- 
 
+if [ -f ~/private/win11-credentials.sh ]; then
+    echo "Credential file exists. Using the file."
+    source ~/private/win11-credentials.sh
+else
+    win11user="USER"
+    win11pass="PASS"
+fi
+
 tmp=$(virsh --connect qemu:///system list | grep " win11 " | awk '{ print $3}')
+
 if ([ "x$tmp" == "x" ] || [ "x$tmp" != "xrunning" ])
 then
     virsh --connect qemu:///system start win11
-    echo "Virtual Machine win11 is starting..."
+    echo "Virtual Machine win11 is starting... Waiting 45s for booting up."
-    exit
+    notify-send "Virtual Machine win11 is starting..." "Waiting 45s for booting up."
+    sleep 45
 else
+    notify-send "Virtual Machine win11 is already running." "Launching xfreerdp now!"
     echo "Starting xfreerdp now..."
-    xfreerdp -grab-keyboard /v:192.168.122.44 /size:100% /cert-ignore /u:raabe /p:SECRET /d: /dynamic-resolution /gfx-h264:avc444 +gfx-progressive &
-    exit
 fi
 
+xfreerdp -grab-keyboard /v:192.168.122.44 /size:100% /cert-ignore /u:$win11user /p:$win11pass /d: /dynamic-resolution /gfx-h264:avc444 +gfx-progressive &

scripts/lockscreentime.sh

@@ -0,0 +1,8 @@
+#/bin/sh
+
+if [ -f "/usr/bin/swayidle" ]; then
+    echo "swayidle is installed."
+    swayidle -w timeout 300 'swaylock -f' timeout 360 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
+else
+    echo "swayidle not installed."
+fi;

scripts/powermenu.sh

@@ -24,7 +24,7 @@ case $choice in
 	$option1)
 		slock ;;
 	$option2)
-		qtile cmd-obj -o cmd -f shutdown ;;
+		loginctl terminate-user $USER ;;
 	$option3)
 		systemctl reboot ;;
 	$option4)

scripts/updatewal-swww.sh

@@ -34,10 +34,11 @@ newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g")
 # ----------------------------------------------------- 
 swww img $wallpaper --transition-step 20 --transition-fps=20
 ~/dotfiles/waybar/launch.sh
+sleep 1
 
 # ----------------------------------------------------- 
 # Send notification
 # ----------------------------------------------------- 
-notify-send "Theme and Wallpaper updated" "With image $newwall"
+notify-send "Colors and Wallpaper updated" "with image $newwall"
 
 echo "DONE!"

scripts/updatewal.sh

@@ -31,10 +31,11 @@ qtile cmd-obj -o cmd -f reload_config
 # ----------------------------------------------------- 
 source "$HOME/.cache/wal/colors.sh"
 newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g")
+sleep 1
 
 # ----------------------------------------------------- 
 # Send notification
 # ----------------------------------------------------- 
-notify-send "Theme and Wallpaper updated" "With image $newwall"
+notify-send "Colors and Wallpaper updated" "with image $newwall"
 
 echo "Done."

scripts/wallpaper-swww.sh

@@ -39,11 +39,12 @@ if [ "$selected" ]; then
     # ----------------------------------------------------- 
     swww img $wallpaper --transition-step 20 --transition-fps=20
     ~/dotfiles/waybar/launch.sh
+    sleep 1
 
     # ----------------------------------------------------- 
     # Send notification
     # ----------------------------------------------------- 
-    notify-send "Theme and Wallpaper updated" "With image $newwall"
+    notify-send "Colors and Wallpaper updated" "with image $newwall"
 
     echo "Done."
 fi

scripts/wallpaper.sh

@@ -28,9 +28,10 @@ if [ "$selected" ]; then
     source "$HOME/.cache/wal/colors.sh"
 
     newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g")
+    sleep 1
 
     # Send notification
-    notify-send "Theme and Wallpaper updated" "With image $newwall"
+    notify-send "Colors and Wallpaper updated" "with image $newwall"
 
     echo "Done."
 fi

swaylock/config

@@ -1,3 +1,13 @@
+#  ____                     _            _     
+# / ___|_      ____ _ _   _| | ___   ___| | __ 
+# \___ \ \ /\ / / _` | | | | |/ _ \ / __| |/ / 
+#  ___) \ V  V / (_| | |_| | | (_) | (__|   <  
+# |____/ \_/\_/ \__,_|\__, |_|\___/ \___|_|\_\ 
+#                     |___/                    
+#  
+# by Stephan Raabe (2023) 
+# ----------------------------------------------------- 
+
 ignore-empty-password
 font="Fira Sans Semibold"
 
@@ -5,21 +15,36 @@ clock
 timestr=%R
 datestr=%a, %e of %B
 
-screenshots
+# Add current screenshot as wallpaper
+# screenshots
 
+# Add an image as a background 
+# In my setup the current wallpaper (requires wallpaper scripts in /scripts)
+image=~/.cache/current_wallpaper.jpg
+
+# Fade in time
 fade-in=1
 
-effect-blur=20x6
+# Effect for background
-effect-greyscale
+# effect-blur=20x6
-effect-scale=0.9
+# effect-greyscale
+effect-pixelate=5
 
+# Show/Hide indicator circle
 indicator
-indicator-radius=240
+
+# smaller indicator
+indicator-radius=200
+
+# bigger indicator
+# indicator-radius=300
+
 indicator-thickness=20
 indicator-caps-lock
 
-key-hl-color=FFFFFF
+# Define all colors
 
+key-hl-color=00000066
 separator-color=00000000
 
 inside-color=00000033
@@ -28,7 +53,7 @@ inside-caps-lock-color=ffffff00
 inside-ver-color=ffffff00
 inside-wrong-color=ffffff00
 
-ring-color=000000
+ring-color=ffffff
 ring-clear-color=ffffff
 ring-caps-lock-color=ffffff
 ring-ver-color=ffffff
@@ -40,6 +65,7 @@ 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

wal/templates/colors-wlogout.css

@@ -0,0 +1,20 @@
+@define-color foreground {foreground};
+@define-color background {background};
+@define-color cursor {cursor};
+
+@define-color color0 {color0};
+@define-color color1 {color1};
+@define-color color2 {color2};
+@define-color color3 {color3};
+@define-color color4 {color4};
+@define-color color5 {color5};
+@define-color color6 {color6};
+@define-color color7 {color7};
+@define-color color8 {color8};
+@define-color color9 {color9};
+@define-color color10 {color10};
+@define-color color11 {color11};
+@define-color color12 {color12};
+@define-color color13 {color13};
+@define-color color14 {color14};
+@define-color color15 {color15};

waybar/config

@@ -59,6 +59,7 @@
     "group/quicklinks": {
         "orientation": "horizontal",
         "modules": [
+            "custom/filemanager",
             "custom/brave",
          ]
     },

waybar/launch.sh

@@ -16,7 +16,7 @@ killall waybar
 # ----------------------------------------------------- 
 # Loading the configuration based on the username
 # ----------------------------------------------------- 
-if [[ $USER = "raabe2" ]]
+if [[ $USER = "raabe" ]]
 then
     waybar -c ~/dotfiles/waybar/myconfig & -s ~/dotfiles/waybar/style.css  
 else

waybar/modules.json

@@ -77,6 +77,13 @@
         "tooltip": false
     },
 
+    // Filemanager Launcher
+    "custom/filemanager": {
+        "format": "",
+        "on-click": "~/dotfiles/scripts/filemanager.sh",
+        "tooltip": false
+    },
+
     // Outlook Launcher
     "custom/outlook": {
         "format": "",
@@ -100,7 +107,7 @@
 
     // ChatGPT Launcher
     "custom/chatgpt": {
-        "format": "",
+        "format": "",
         "on-click": "brave --app=https://chat.openai.com",
         "tooltip": false
     },
@@ -112,10 +119,10 @@
         "tooltip": false
     },
 
-    // Looking Glass Launcher
+    // Windows VM
-    "custom/lookingglass": {
+    "custom/windowsvm": {
         "format": "",
-        "on-click": "~/dotfiles/scripts/looking-glass.sh",
+        "on-click": "~/private/launchvm.sh",
         "tooltip": false
     },
 

waybar/myconfig

@@ -59,8 +59,9 @@
     "group/quicklinks": {
         "orientation": "horizontal",
         "modules": [
+            "custom/filemanager",
             "custom/chatgpt",
-            "custom/lookingglass"
+            "custom/windowsvm"
          ]
     },
 

waybar/style.css

@@ -117,7 +117,8 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #taskbar {
-    background: @color11;
+    /* background: @color11; */
+    background: #FFFFFF;
     margin: 3px 15px 3px 0px;
     padding: 2px 3px 1px 3px;
     border-radius: 14px;
@@ -148,9 +149,11 @@ window#waybar.empty #window {
  * Custom Quicklinks
  * ----------------------------------------------------- */
 
-#custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass {
+#custom-brave, #custom-outlook, #custom-filemanager, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-windowsvm {
-    margin-right:15px;
+    margin-right:20px;
     font-size:20px;
+    font-weight:bold;
+    opacity:0.8;
 }
 
 /* -----------------------------------------------------

wlogout/style.css

@@ -10,69 +10,86 @@ by Stephan Raabe (2023)
 ----------------------------------------------------- 
 */
 
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../.cache/wal/colors-wlogout.css';
+
+/* -----------------------------------------------------
+ * General 
+ * ----------------------------------------------------- */
+
 * {
+    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
 	background-image: none;
-	transition: 0ms;
+	transition: 20ms;
 }
 
 window {
 	background-color: rgba(12, 12, 12, 0.1);
-	background-image: url('./noise.png');
 }
 
 button {
 	color: #FFFFFF;
-	border-style: solid;
+    font-size:20px;
-	border-width: 2px;
+
     background-repeat: no-repeat;
 	background-position: center;
 	background-size: 25%;
 
-	background-color: rgba(108, 112, 134, 0.4);
+	border-style: solid;
-	border: 1px solid rgba(108, 112, 134, 0.3);
+	background-color: rgba(12, 12, 12, 0.3);
-	border-top: 1px solid rgba(108, 112, 134, 0.3);
+	border: 3px solid #FFFFFF;
+
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 button:focus,
 button:active,
 button:hover {
-	background-color: rgba(156, 161, 192, 0.5);
+    color: @color11;
-	border: 1px solid rgba(108, 112, 134, 0.15);
+	background-color: rgba(12, 12, 12, 0.5);
-	border-top: 1px solid rgba(108, 112, 134, 0.15);
+	border: 3px solid @color11;
 }
 
+/* 
+----------------------------------------------------- 
+Buttons
+----------------------------------------------------- 
+*/
+
 #lock {
 	margin: 10px;
 	border-radius: 20px;
-	background-image: image(url("/usr/share/wlogout/icons/lock.png"), url("/usr/local/share/wlogout/icons/lock.png"));
+	background-image: image(url("icons/lock.png"));
 }
 
 #logout {
 	margin: 10px;
 	border-radius: 20px;
-	background-image: image(url("/usr/share/wlogout/icons/logout.png"), url("/usr/local/share/wlogout/icons/logout.png"));
+	background-image: image(url("icons/logout.png"));
 }
 
 #suspend {
 	margin: 10px;
 	border-radius: 20px;
-	background-image: image(url("/usr/share/wlogout/icons/suspend.png"), url("/usr/local/share/wlogout/icons/suspend.png"));
+	background-image: image(url("icons/suspend.png"));
 }
 
 #hibernate {
 	margin: 10px;
 	border-radius: 20px;
-	background-image: image(url("/usr/share/wlogout/icons/hibernate.png"), url("/usr/local/share/wlogout/icons/hibernate.png"));
+	background-image: image(url("icons/hiberate.png"));
 }
 
 #shutdown {
 	margin: 10px;
 	border-radius: 20px;
-	background-image: image(url("/usr/share/wlogout/icons/shutdown.png"), url("/usr/local/share/wlogout/icons/shutdown.png"));
+	background-image: image(url("icons/shutdown.png"));
 }
 
 #reboot {
 	margin: 10px;
 	border-radius: 20px;
-	background-image: image(url("/usr/share/wlogout/icons/reboot.png"), url("/usr/local/share/wlogout/icons/reboot.png"));
+	background-image: image(url("icons/reboot.png"));
 }