diff --git a/.install/version.sh b/.install/version.sh index e717773..9940f67 100644 --- a/.install/version.sh +++ b/.install/version.sh @@ -1 +1 @@ -version="2.7RC3" +version="2.7RC4" diff --git a/.install/version.txt b/.install/version.txt index a36df4e..2a14d60 100644 --- a/.install/version.txt +++ b/.install/version.txt @@ -1 +1 @@ -269 \ No newline at end of file +270 \ No newline at end of file diff --git a/README.md b/README.md index 22adad2..a6139d9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ML4W dotfiles 2.7 RC3 +# ML4W dotfiles 2.7 RC4 This is my configuration of Hyprland (Wayland) and Qtile (Xorg & Wayland) for Arch. This package includes an installation script to install and setup the required components. @@ -257,4 +257,25 @@ With SUPER + SHIFT + S, you can switch between # Wallpaper repository -You can find my wallpaper collection in the repository https://gitlab.com/stephan-raabe/wallpaper \ No newline at end of file +You can find my wallpaper collection in the repository https://gitlab.com/stephan-raabe/wallpaper + +# Special Thanks + +THANK YOU very much for all your support, contributions and ideas: + +- Diana Ward: https://github.com/dianaw353 +- dwilliam62: https://github.com/dwilliam62 +- Teodor Orzechowski: https://gitlab.com/sq6gtt +and many more... + +Thanks to all YouTube subscribers for all your great feedback. + +# Inspirations + +The following projects have inspired me: + +- https://github.com/dianaw353/hyprland-configuration-rootfs +- https://github.com/prasanthrangan/hyprdots +- https://github.com/sudo-harun/dotfiles +and many more... + diff --git a/hypr/conf/decorations/no-rounding-more-blur.conf b/hypr/conf/decorations/no-rounding-more-blur.conf index 39405a8..b83b4cf 100644 --- a/hypr/conf/decorations/no-rounding-more-blur.conf +++ b/hypr/conf/decorations/no-rounding-more-blur.conf @@ -7,8 +7,8 @@ decoration { rounding = 0 blur { enabled = true - size = 20 - passes = 2 + size = 12 + passes = 6 new_optimizations = on ignore_opacity = true xray = true diff --git a/hypr/conf/decorations/rounding-all-blur-no-shadows.conf b/hypr/conf/decorations/rounding-all-blur-no-shadows.conf index 09a3ff5..00131b6 100644 --- a/hypr/conf/decorations/rounding-all-blur-no-shadows.conf +++ b/hypr/conf/decorations/rounding-all-blur-no-shadows.conf @@ -7,12 +7,12 @@ decoration { rounding = 10 blur { enabled = true - size = 20 - passes = 2 + size = 12 + passes = 4 new_optimizations = on ignore_opacity = true xray = true - # blurls = waybar + blurls = waybar } active_opacity = 0.9 inactive_opacity = 0.6 diff --git a/hypr/conf/decorations/rounding-all-blur.conf b/hypr/conf/decorations/rounding-all-blur.conf index 382d422..d8ead80 100644 --- a/hypr/conf/decorations/rounding-all-blur.conf +++ b/hypr/conf/decorations/rounding-all-blur.conf @@ -7,12 +7,12 @@ decoration { rounding = 10 blur { enabled = true - size = 20 - passes = 2 + size = 12 + passes = 4 new_optimizations = on ignore_opacity = true xray = true - # blurls = waybar + blurls = waybar } active_opacity = 0.9 inactive_opacity = 0.6 diff --git a/hypr/conf/decorations/rounding-more-blur.conf b/hypr/conf/decorations/rounding-more-blur.conf index bad2e13..a2a9b21 100644 --- a/hypr/conf/decorations/rounding-more-blur.conf +++ b/hypr/conf/decorations/rounding-more-blur.conf @@ -7,8 +7,8 @@ decoration { rounding = 10 blur { enabled = true - size = 20 - passes = 2 + size = 12 + passes = 6 new_optimizations = on ignore_opacity = true xray = true diff --git a/hypr/conf/decorations/rounding.conf b/hypr/conf/decorations/rounding.conf new file mode 100644 index 0000000..ab5bc81 --- /dev/null +++ b/hypr/conf/decorations/rounding.conf @@ -0,0 +1,25 @@ +# ----------------------------------------------------- +# General window decoration +# name: "Default" +# ----------------------------------------------------- + +decoration { + rounding = 10 + blur { + enabled = true + size = 6 + passes = 2 + new_optimizations = on + ignore_opacity = true + xray = true + # 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 +} diff --git a/hypr/conf/monitors/1440x1080.conf b/hypr/conf/monitors/1440x1080.conf new file mode 100644 index 0000000..c0cec05 --- /dev/null +++ b/hypr/conf/monitors/1440x1080.conf @@ -0,0 +1,6 @@ +# ----------------------------------------------------- +# Monitor Setup +# name: "Default" +# ----------------------------------------------------- + +monitor=,1440x1080,auto,1 \ No newline at end of file diff --git a/hypr/conf/monitors/1920x1080.conf b/hypr/conf/monitors/1920x1080.conf index 03c52f7..980be0e 100644 --- a/hypr/conf/monitors/1920x1080.conf +++ b/hypr/conf/monitors/1920x1080.conf @@ -3,5 +3,4 @@ # name: "Default" # ----------------------------------------------------- -monitor=,1920x1080,auto,1 -# 122314 lkasldkasl kjd +monitor=,1920x1080,auto,1 \ No newline at end of file diff --git a/hypr/conf/monitors/2560x1440.conf b/hypr/conf/monitors/2560x1440.conf new file mode 100644 index 0000000..a327bd4 --- /dev/null +++ b/hypr/conf/monitors/2560x1440.conf @@ -0,0 +1,6 @@ +# ----------------------------------------------------- +# Monitor Setup +# name: "Default" +# ----------------------------------------------------- + +monitor=,2560x1440,auto,1 \ No newline at end of file diff --git a/hypr/conf/windows/border-1-reverse.conf b/hypr/conf/windows/border-1-reverse.conf new file mode 100644 index 0000000..671957c --- /dev/null +++ b/hypr/conf/windows/border-1-reverse.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# General window layout and colors +# name: "Default" +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 1 + col.active_border = rgba(ffffffff) + col.inactive_border = $color11 + layout = dwindle +} diff --git a/hypr/conf/windows/border-1.conf b/hypr/conf/windows/border-1.conf new file mode 100644 index 0000000..cd09761 --- /dev/null +++ b/hypr/conf/windows/border-1.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# General window layout and colors +# name: "Default" +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 1 + col.active_border = $color11 + col.inactive_border = rgba(ffffffff) + layout = dwindle +} diff --git a/hypr/conf/windows/border-2-reverse.conf b/hypr/conf/windows/border-2-reverse.conf new file mode 100644 index 0000000..4124390 --- /dev/null +++ b/hypr/conf/windows/border-2-reverse.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# General window layout and colors +# name: "Default" +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 2 + col.active_border = rgba(ffffffff) + col.inactive_border = $color11 + layout = dwindle +} diff --git a/hypr/conf/windows/border-2.conf b/hypr/conf/windows/border-2.conf new file mode 100644 index 0000000..b880c5d --- /dev/null +++ b/hypr/conf/windows/border-2.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# General window layout and colors +# name: "Default" +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 2 + col.active_border = $color11 + col.inactive_border = rgba(ffffffff) + layout = dwindle +} diff --git a/hypr/conf/windows/border-3-reverse.conf b/hypr/conf/windows/border-3-reverse.conf new file mode 100644 index 0000000..afe2c99 --- /dev/null +++ b/hypr/conf/windows/border-3-reverse.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# General window layout and colors +# name: "Default" +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 3 + col.active_border = rgba(ffffffff) + col.inactive_border = $color11 + layout = dwindle +} diff --git a/hypr/conf/windows/border-3.conf b/hypr/conf/windows/border-3.conf new file mode 100644 index 0000000..9ac7993 --- /dev/null +++ b/hypr/conf/windows/border-3.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# General window layout and colors +# name: "Default" +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 3 + col.active_border = $color11 + col.inactive_border = rgba(ffffffff) + layout = dwindle +} diff --git a/hypr/conf/windows/border-4-reverse.conf b/hypr/conf/windows/border-4-reverse.conf new file mode 100644 index 0000000..4af6c24 --- /dev/null +++ b/hypr/conf/windows/border-4-reverse.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# General window layout and colors +# name: "Default" +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 4 + col.active_border = rgba(ffffffff) + col.inactive_border = $color11 + layout = dwindle +} diff --git a/hypr/conf/windows/border-4.conf b/hypr/conf/windows/border-4.conf new file mode 100644 index 0000000..dcc1d04 --- /dev/null +++ b/hypr/conf/windows/border-4.conf @@ -0,0 +1,13 @@ +# ----------------------------------------------------- +# General window layout and colors +# name: "Default" +# ----------------------------------------------------- + +general { + gaps_in = 10 + gaps_out = 14 + border_size = 4 + col.active_border = $color11 + col.inactive_border = rgba(ffffffff) + layout = dwindle +} diff --git a/hypr/conf/windows/default.conf b/hypr/conf/windows/default.conf index 9ac7993..cd09761 100644 --- a/hypr/conf/windows/default.conf +++ b/hypr/conf/windows/default.conf @@ -6,7 +6,7 @@ general { gaps_in = 10 gaps_out = 14 - border_size = 3 + border_size = 1 col.active_border = $color11 col.inactive_border = rgba(ffffffff) layout = dwindle diff --git a/hypr/settings/.library/library.sh b/hypr/settings/.library/library.sh index 8a8d727..51f255c 100644 --- a/hypr/settings/.library/library.sh +++ b/hypr/settings/.library/library.sh @@ -134,11 +134,13 @@ _getConfSelector() { echo "In use: ${cur##*/}" echo "" echo "Select a file to load (RETURN = Confirm, ESC = Cancel/Back):" - sel=$(gum file $installFolder/conf/$2) + echo "" + sel=$(gum choose $(ls $installFolder/conf/$2)) + if [ -z $sel ] ;then _goBack fi - echo "File ${sel##*/} selected." + echo "File $sel selected." echo "" } @@ -146,10 +148,10 @@ _getConfEditor() { selected=$(gum choose "EXECUTE" "EDIT" "COPY" "DELETE" "CANCEL") case $selected in EXECUTE) - _writeConf $1 $2 + _writeConf $1 $2 $3 break;; EDIT) - vim $sel + vim $installFolder/conf/$3/$2 sleep 1 _reloadModule break;; @@ -165,19 +167,19 @@ _getConfEditor() { if [ -f $(dirname $sel)/$filename ] ;then echo "ERROR: File already exists." else - cp $sel $(dirname $sel)/$filename + cp $installFolder/conf/$3/$sel $installFolder/conf/$3/$filename _reloadModule fi fi fi - _getConfEditor $1 $2 + _getConfEditor $1 $2 $3 break;; DELETE) - if gum confirm "Do you really want to delete the file ${sel##*/}?" ;then - rm $sel + if gum confirm "Do you really want to delete the file $sel?" ;then + rm $installFolder/conf/$3/$sel _reloadModule else - _getConfEditor $1 $2 + _getConfEditor $1 $2 $3 fi break;; * ) @@ -188,8 +190,8 @@ _getConfEditor() { # _writeConf conf/monitor.conf $sel _writeConf() { if [ ! -z $2 ] ;then - sel=$(echo "$2" | sed "s+"\/home\/$USER"+~+") - echo "source = $sel" > $installFolder/conf/$1 + editsel=$(echo "$installFolder/conf/$3/$2" | sed "s+"\/home\/$USER"+~+") + echo "source = $editsel" > $installFolder/conf/$1 fi } diff --git a/hypr/settings/modules/appearance/animations/module.sh b/hypr/settings/modules/appearance/animations/module.sh index 1a8387e..9475d03 100755 --- a/hypr/settings/modules/appearance/animations/module.sh +++ b/hypr/settings/modules/appearance/animations/module.sh @@ -3,5 +3,5 @@ _getHeader "$name" "$author" sel="" _getConfSelector animation.conf animations -_getConfEditor animation.conf $sel +_getConfEditor animation.conf $sel animations _reloadModule \ No newline at end of file diff --git a/hypr/settings/modules/appearance/decorations/config.sh b/hypr/settings/modules/appearance/decorations/config.sh new file mode 100644 index 0000000..ee3a3af --- /dev/null +++ b/hypr/settings/modules/appearance/decorations/config.sh @@ -0,0 +1,3 @@ +name="Decorations" +order=1 +author="Stephan Raabe ML4W" diff --git a/hypr/settings/modules/appearance/decorations/module.sh b/hypr/settings/modules/appearance/decorations/module.sh new file mode 100755 index 0000000..9352702 --- /dev/null +++ b/hypr/settings/modules/appearance/decorations/module.sh @@ -0,0 +1,8 @@ +#!/bin/bash +_getHeader "$name" "$author" + +sel="" +_getConfSelector decoration.conf decorations +_getConfEditor decoration.conf $sel decorations +setsid $HOME/dotfiles/waybar/launch.sh 1>/dev/null 2>&1 & +_reloadModule \ No newline at end of file diff --git a/hypr/settings/modules/appearance/wallpaper/config.sh b/hypr/settings/modules/appearance/wallpaper/config.sh new file mode 100644 index 0000000..661f614 --- /dev/null +++ b/hypr/settings/modules/appearance/wallpaper/config.sh @@ -0,0 +1,2 @@ +name="Wallpaper" +order=1 diff --git a/hypr/settings/modules/appearance/wallpaper/module.sh b/hypr/settings/modules/appearance/wallpaper/module.sh new file mode 100755 index 0000000..eef58f4 --- /dev/null +++ b/hypr/settings/modules/appearance/wallpaper/module.sh @@ -0,0 +1,4 @@ +#!/bin/bash +_getHeader "$name" "$author" +setsid $HOME/dotfiles/hypr/scripts/wallpaper.sh select 1>/dev/null 2>&1 & +_goBack \ No newline at end of file diff --git a/hypr/settings/modules/appearance/windows/module.sh b/hypr/settings/modules/appearance/windows/module.sh index 3632c39..627ce31 100755 --- a/hypr/settings/modules/appearance/windows/module.sh +++ b/hypr/settings/modules/appearance/windows/module.sh @@ -3,5 +3,5 @@ _getHeader "$name" "$author" sel="" _getConfSelector window.conf windows -_getConfEditor window.conf $sel +_getConfEditor window.conf $sel windows _reloadModule \ No newline at end of file diff --git a/hypr/settings/modules/keybindings/module.sh b/hypr/settings/modules/keybindings/module.sh index eb78cce..7eaaf8d 100755 --- a/hypr/settings/modules/keybindings/module.sh +++ b/hypr/settings/modules/keybindings/module.sh @@ -3,6 +3,6 @@ _getHeader "$name" sel="" _getConfSelector keybinding.conf keybindings -_getConfEditor keybinding.conf $sel +_getConfEditor keybinding.conf $sel keybindings _reloadModule diff --git a/hypr/settings/modules/system/environment/module.sh b/hypr/settings/modules/system/environment/module.sh index 0c8d050..4ad76a7 100755 --- a/hypr/settings/modules/system/environment/module.sh +++ b/hypr/settings/modules/system/environment/module.sh @@ -3,5 +3,5 @@ _getHeader "$name" "$author" sel="" _getConfSelector environment.conf environments -_getConfEditor environment.conf $sel +_getConfEditor environment.conf $sel environments _reloadModule diff --git a/hypr/settings/modules/system/monitor/module.sh b/hypr/settings/modules/system/monitor/module.sh index dc08ba7..7598bac 100755 --- a/hypr/settings/modules/system/monitor/module.sh +++ b/hypr/settings/modules/system/monitor/module.sh @@ -3,5 +3,5 @@ _getHeader "$name" "$author" sel="" _getConfSelector monitor.conf monitors -_getConfEditor monitor.conf $sel +_getConfEditor monitor.conf $sel monitors _reloadModule \ No newline at end of file diff --git a/hypr/settings/modules/system/windowrules/module.sh b/hypr/settings/modules/system/windowrules/module.sh index 893258b..b24409d 100755 --- a/hypr/settings/modules/system/windowrules/module.sh +++ b/hypr/settings/modules/system/windowrules/module.sh @@ -3,5 +3,5 @@ _getHeader "$name" "$author" sel="" _getConfSelector windowrule.conf windowrules -_getConfEditor windowrule.conf $sel +_getConfEditor windowrule.conf $sel windowrules _reloadModule diff --git a/hypr/settings/modules/waybar/themes/config.sh b/hypr/settings/modules/waybar/themes/config.sh new file mode 100644 index 0000000..f103d9f --- /dev/null +++ b/hypr/settings/modules/waybar/themes/config.sh @@ -0,0 +1,2 @@ +name="Themes" +order=1 diff --git a/hypr/settings/modules/waybar/themes/module.sh b/hypr/settings/modules/waybar/themes/module.sh new file mode 100755 index 0000000..865f856 --- /dev/null +++ b/hypr/settings/modules/waybar/themes/module.sh @@ -0,0 +1,4 @@ +#!/bin/bash +_getHeader "$name" "$author" +setsid $HOME/dotfiles/waybar/themeswitcher.sh 1>/dev/null 2>&1 & +_goBack \ No newline at end of file