Merge branch 'upstream-main' into upstream-custom
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
# -----------------------------------------------------
|
||||
# Animations
|
||||
# name "Default"
|
||||
# -----------------------------------------------------
|
||||
animations {
|
||||
enabled = false
|
||||
}
|
||||
@@ -18,16 +18,17 @@ exec-once = ~/dotfiles/hypr/scripts/gtk.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
|
||||
# exec-once = nm-applet --indicator
|
||||
# END NM APPLET
|
||||
|
||||
# Load cliphist history
|
||||
exec-once = wl-paste --watch cliphist store
|
||||
|
||||
# Initialize Wallpaper Engine
|
||||
exec-once = ~/dotfiles/hypr/scripts/init-wallpaper-engine.sh
|
||||
|
||||
# Start ML4W Welcome App
|
||||
# Autostart ML4W App
|
||||
exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
|
||||
|
||||
# Load configuration from ML4W Hyprland Settings App
|
||||
exec-once = ~/.config/ml4w-hyprland-settings/hyprctl.sh
|
||||
|
||||
# Start ewww daemon
|
||||
exec-once = ~/dotfiles/hypr/scripts/eww.sh
|
||||
@@ -4,5 +4,11 @@
|
||||
# -----------------------------------------------------
|
||||
|
||||
env = XCURSOR_SIZE,24
|
||||
env = XDG_CURRENT_DESKTOP,Hyprland
|
||||
env = XDG_SESSION_TYPE,wayland
|
||||
env = XDG_SESSION_DESKTOP,Hyprland
|
||||
env = QT_QPA_PLATFORM,wayland
|
||||
|
||||
env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
|
||||
env = QT_AUTO_SCREEN_SCALE_FACTOR,1
|
||||
env = MOZ_ENABLE_WAYLAND,1
|
||||
env = GDK_SCALE,1
|
||||
|
||||
@@ -4,6 +4,13 @@
|
||||
# -----------------------------------------------------
|
||||
|
||||
env = XCURSOR_SIZE,24
|
||||
env = XDG_CURRENT_DESKTOP,Hyprland
|
||||
env = XDG_SESSION_TYPE,wayland
|
||||
env = XDG_SESSION_DESKTOP,Hyprland
|
||||
env = QT_QPA_PLATFORM,wayland
|
||||
env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
|
||||
env = QT_AUTO_SCREEN_SCALE_FACTOR,1
|
||||
env = MOZ_ENABLE_WAYLAND,1
|
||||
env = GDK_SCALE,1
|
||||
env = WLR_NO_HARDWARE_CURSORS, 1
|
||||
env = WLR_RENDERER_ALLOW_SOFTWARE, 1
|
||||
|
||||
@@ -31,6 +31,7 @@ bind = $mainMod SHIFT, down, resizeactive, 0 100
|
||||
bind = $mainMod, G, togglegroup
|
||||
|
||||
# Actions
|
||||
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
|
||||
|
||||
+10
-1
@@ -18,8 +18,17 @@ 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.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)
|
||||
windowrulev2 = center,class:(ml4w-hyprland-settings.py)
|
||||
|
||||
windowrulev2 = float,class:(dotfiles-floating)
|
||||
windowrulev2 = size 1000 800,class:(dotfiles-floating)
|
||||
windowrulev2 = center,class:(dotfiles-floating)
|
||||
|
||||
env = APPIMAGELAUNCHER_DISABLE,1
|
||||
env = APPIMAGELAUNCHER_DISABLE,1
|
||||
|
||||
|
||||
+4
-1
@@ -6,6 +6,9 @@
|
||||
# |___/|_|
|
||||
#
|
||||
# -----------------------------------------------------
|
||||
# IMPORTANT: Don't overwrite ML4W configuration.
|
||||
# Create your own custom configuration variation instead.
|
||||
# https://gitlab.com/stephan-raabe/dotfiles#hyprland-configuration-variations
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Monitor
|
||||
@@ -58,7 +61,7 @@ source = ~/dotfiles/hypr/conf/animation.conf
|
||||
source = ~/dotfiles/hypr/conf/custom.conf
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Custom
|
||||
# ML4W Configuration
|
||||
# -----------------------------------------------------
|
||||
source = ~/dotfiles/hypr/conf/ml4w.conf
|
||||
|
||||
|
||||
+17
-2
@@ -20,7 +20,7 @@ input-field {
|
||||
dots_center = true
|
||||
dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
|
||||
outer_color = rgb(151515)
|
||||
inner_color = rgb(200, 200, 200)
|
||||
inner_color = rgb(FFFFFF)
|
||||
font_color = rgb(10, 10, 10)
|
||||
fade_on_empty = true
|
||||
fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
|
||||
@@ -47,7 +47,7 @@ label {
|
||||
color = rgba(200, 200, 200, 1.0)
|
||||
font_size = 55
|
||||
font_family = Fira Semibold
|
||||
position = -100, -200
|
||||
position = -100, -40
|
||||
halign = right
|
||||
valign = bottom
|
||||
shadow_passes = 5
|
||||
@@ -65,4 +65,19 @@ label {
|
||||
valign = bottom
|
||||
shadow_passes = 5
|
||||
shadow_size = 10
|
||||
}
|
||||
|
||||
image {
|
||||
monitor =
|
||||
path = $HOME/.cache/square_wallpaper.png
|
||||
size = 280 # lesser side if not 1:1 ratio
|
||||
rounding = -1 # negative values mean circle
|
||||
border_size = 4
|
||||
border_color = rgb(221, 221, 221)
|
||||
rotate = 0 # degrees, counter-clockwise
|
||||
reload_time = -1 # seconds between reloading, 0 to reload with SIGUSR2
|
||||
# reload_cmd = # command to get new path. if empty, old path will be used. don't run "follow" commands like tail -F
|
||||
position = 0, 200
|
||||
halign = center
|
||||
valign = center
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
import sys
|
||||
import subprocess
|
||||
import os
|
||||
import json
|
||||
import pathlib
|
||||
import shutil
|
||||
|
||||
# Get script path
|
||||
pathname = os.path.dirname(sys.argv[0])
|
||||
homeFolder = os.path.expanduser('~') # Path to home folder
|
||||
dotfiles = homeFolder + "/dotfiles/"
|
||||
|
||||
result = subprocess.run(["bash", dotfiles + "hypr/scripts/monitors.sh"], capture_output=True, text=True)
|
||||
monitors_json = result.stdout.strip()
|
||||
monitors_arr = json.loads(monitors_json)
|
||||
for row in monitors_arr:
|
||||
if row["focused"]:
|
||||
print(row["id"])
|
||||
Executable
+6
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
EWW=`which eww`
|
||||
if [[ ! `pidof eww` ]]; then
|
||||
${EWW} daemon
|
||||
sleep 0.5
|
||||
fi
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
sleep 1
|
||||
sleep 0.5
|
||||
killall -9 Hyprland sleep 2
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
sleep 0.5
|
||||
hyprlock
|
||||
Executable
+33
@@ -0,0 +1,33 @@
|
||||
#!/bin/bash
|
||||
# __ __ _ _ ___ __ _ _
|
||||
# | \/ | | | || \ \ / / | | __ _ _ _ _ __ ___| |__ ___ _ __
|
||||
# | |\/| | | | || |\ \ /\ / / | | / _` | | | | '_ \ / __| '_ \ / _ \ '__|
|
||||
# | | | | |__|__ _\ V V / | |__| (_| | |_| | | | | (__| | | | __/ |
|
||||
# |_| |_|_____| |_| \_/\_/ |_____\__,_|\__,_|_| |_|\___|_| |_|\___|_|
|
||||
#
|
||||
|
||||
option1="ML4W Dotfiles Settings"
|
||||
option2="Hyprland Settings"
|
||||
option3="Change Wallpaper"
|
||||
option4="Change Waybar Theme"
|
||||
option5="ML4W Welcome App"
|
||||
|
||||
options="$option1\n"
|
||||
options="$options$option2\n"
|
||||
options="$options$option3\n"
|
||||
options="$options$option4\n$option5"
|
||||
|
||||
choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-ml4w-launcher.rasi -l 5)
|
||||
|
||||
case $choice in
|
||||
$option1)
|
||||
$HOME/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage ;;
|
||||
$option2)
|
||||
$HOME/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage ;;
|
||||
$option3)
|
||||
$HOME/dotfiles/hypr/scripts/wallpaper.sh select ;;
|
||||
$option4)
|
||||
$HOME/dotfiles/waybar/themeswitcher.sh ;;
|
||||
$option5)
|
||||
$HOME/dotfiles/apps/ML4W_Welcome-x86_64.AppImage ;;
|
||||
esac
|
||||
Executable
+2
@@ -0,0 +1,2 @@
|
||||
#!/bin/bash
|
||||
hyprctl -j monitors
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
sleep 0.5
|
||||
systemctl reboot
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
sleep 0.5
|
||||
systemctl poweroff
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
sleep 0.5
|
||||
systemctl suspend
|
||||
Executable
+13
@@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
cache_file="$HOME/.cache/toggle_animation"
|
||||
if [[ $(cat $HOME/dotfiles/hypr/conf/animation.conf) == *"disabled"* ]]; then
|
||||
echo ":: Toggle blocked by disabled.conf variation."
|
||||
else
|
||||
if [ -f $cache_file ] ;then
|
||||
hyprctl keyword animations:enabled true
|
||||
rm $cache_file
|
||||
else
|
||||
hyprctl keyword animations:enabled false
|
||||
touch $cache_file
|
||||
fi
|
||||
fi
|
||||
@@ -12,6 +12,7 @@
|
||||
# Cache file for holding the current wallpaper
|
||||
cache_file="$HOME/.cache/current_wallpaper"
|
||||
blurred="$HOME/.cache/blurred_wallpaper.png"
|
||||
square="$HOME/.cache/square_wallpaper.png"
|
||||
rasi_file="$HOME/.cache/current_wallpaper.rasi"
|
||||
blur_file="$HOME/dotfiles/.settings/blur.sh"
|
||||
|
||||
@@ -114,8 +115,12 @@ if [ "$1" == "init" ] ;then
|
||||
echo ":: Init"
|
||||
else
|
||||
sleep 1
|
||||
dunstify "Changing wallpaper ..." "with image $newwall" -h int:value:33 -h string:x-dunst-stack-tag:wallpaper
|
||||
sleep 2
|
||||
dunstify "Changing wallpaper ..." "with image $newwall" -h int:value:25 -h string:x-dunst-stack-tag:wallpaper
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Reload Hyprctl.sh
|
||||
# -----------------------------------------------------
|
||||
$HOME/.config/ml4w-hyprland-settings/hyprctl.sh &
|
||||
fi
|
||||
|
||||
# -----------------------------------------------------
|
||||
@@ -124,7 +129,7 @@ fi
|
||||
if [ "$1" == "init" ] ;then
|
||||
echo ":: Init"
|
||||
else
|
||||
dunstify "Creating blurred version ..." "with image $newwall" -h int:value:66 -h string:x-dunst-stack-tag:wallpaper
|
||||
dunstify "Creating blurred version ..." "with image $newwall" -h int:value:50 -h string:x-dunst-stack-tag:wallpaper
|
||||
fi
|
||||
|
||||
magick $wallpaper -resize 75% $blurred
|
||||
@@ -134,6 +139,17 @@ if [ ! "$blur" == "0x0" ] ;then
|
||||
echo ":: Blurred"
|
||||
fi
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Created quare wallpaper
|
||||
# -----------------------------------------------------
|
||||
if [ "$1" == "init" ] ;then
|
||||
echo ":: Init"
|
||||
else
|
||||
dunstify "Creating square version ..." "with image $newwall" -h int:value:75 -h string:x-dunst-stack-tag:wallpaper
|
||||
fi
|
||||
magick $wallpaper -gravity Center -extent 1:1 $square
|
||||
echo ":: Square version created"
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Write selected wallpaper into .cache files
|
||||
# -----------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user