diff --git a/Configs/.config/bin/record.sh b/Configs/.config/bin/record.sh index 0740ff5..7ada6f5 100755 --- a/Configs/.config/bin/record.sh +++ b/Configs/.config/bin/record.sh @@ -67,7 +67,7 @@ start_screenrecording() { # Merge audio tracks into one - separate tracks only play one at a time in most players [[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input" - notify-send "Screen recording" "Starting recording to $filename" -t 1000 + notify-send "Screen recording" "Starting recording to $filename" -t 1000 -i record-desktop sleep 1.1 gpu-screen-recorder -w "$@" -f 60 -c mp4 -o "$filename" $audio_args & diff --git a/Configs/.config/hypr/hyprland/autostart.conf b/Configs/.config/hypr/hyprland/autostart.conf index 1954fb6..a522f77 100644 --- a/Configs/.config/hypr/hyprland/autostart.conf +++ b/Configs/.config/hypr/hyprland/autostart.conf @@ -17,7 +17,7 @@ exec-once = uwsm app -- hypridle exec-once = uwsm app -- nwg-look -a exec-once = uwsm app -- wl-clip-persist --clipboard regular --write-timeout 1000 --selection-size-limit 2097152 --all-mime-type-regex '(?i)^(?!(?:image|audio|video|font|model)/|x-kde-passwordManagerHint).+' -exec-once = uwsm app -- vicinae server +# exec-once = uwsm app -- vicinae server --replace exec-once = uwsm app -- swaync -c ~/.config/swaync/config.json exec-once = uwsm app -- waybar -c ~/.config/waybar/config.jsonc -s ~/.config/waybar/styles.css @@ -25,8 +25,8 @@ exec-once = uwsm app -- waybar -c ~/.config/waybar/config.jsonc -s ~/.config/way exec-once = uwsm app -- nm-applet exec-once = uwsm app -- blueman-applet -### User programs +## User programs # exec-once = uwsm app -- kdeconnectd # exec-once = uwsm app -- kdeconnect-indicator -# exec-once = [workspace 5 silent] uwsm app -- keepassxc +# exec-once = sleep 2; hyprctl dispatch exec '[workspace 5 silent] keepassxc' diff --git a/Configs/.config/hypr/hyprland/general.conf b/Configs/.config/hypr/hyprland/general.conf index c247313..e27b40a 100644 --- a/Configs/.config/hypr/hyprland/general.conf +++ b/Configs/.config/hypr/hyprland/general.conf @@ -21,9 +21,10 @@ env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 env = QT_AUTO_SCREEN_SCALE_FACTOR,1 env = MOZ_ENABLE_WAYLAND,1 -env = ELECTRON_OZONE_PLATFORM_HINT,wayland +env = ELECTRON_OZONE_PLATFORM_HINT,auto env = OZONE_PLATFORM,wayland env = XDG_SESSION_TYPE,wayland +env = GDK_SCALE,1 # env = GDK_BACKEND,wayland,x11,* # env = SDL_VIDEODRIVER,wayland @@ -68,8 +69,8 @@ general { decoration { rounding = 13 - active_opacity = 0.92 - inactive_opacity = 0.92 + active_opacity = 0.94 + inactive_opacity = 0.94 blur { enabled = true @@ -145,6 +146,12 @@ cursor { # https://wiki.hypr.land/Configuring/Variables/#ecosystem ecosystem { no_update_news = true + no_donation_nag = true +} + +# https://wiki.hypr.land/Configuring/XWayland/ +xwayland { + force_zero_scaling = true } diff --git a/Configs/.config/hypr/hyprland/keybindings.conf b/Configs/.config/hypr/hyprland/keybindings.conf index 09f359b..e3613b6 100644 --- a/Configs/.config/hypr/hyprland/keybindings.conf +++ b/Configs/.config/hypr/hyprland/keybindings.conf @@ -76,7 +76,7 @@ bind = $mainMod SHIFT, Z, exec, hyprctl keyword cursor:zoom_factor 1.0 # Window management -bind = $mainMod, Q, killactive, +bind = $mainMod SHIFT, Q, killactive, bind = $mainMod, D, togglesplit, # dwindle bind = $mainMod SHIFT, A, pseudo, # dwindle diff --git a/Configs/.config/hypr/hyprland/rules.conf b/Configs/.config/hypr/hyprland/rules.conf index 0d41320..1605551 100644 --- a/Configs/.config/hypr/hyprland/rules.conf +++ b/Configs/.config/hypr/hyprland/rules.conf @@ -15,6 +15,13 @@ windowrule { size = 400 500 } +# windowrule { +# name = center-all-floating +# match:float = true +# match:xwayland = false +# center = true +# } + # General floating windows $FLOAT_CLASSES = ^(org.pulseaudio.pavucontrol|nm-connection-editor\ |blueman-manager|nekobox|waypaper)$ @@ -90,11 +97,25 @@ windowrule { # } # Steam -$STEAM_FLOAT_TITLES=^(Steam Settings)$ +windowrule { + name = steam + match:class = steam + match:initial_title = Steam + float = off +} + windowrule { name = steam-settings - match:title = $STEAM_FLOAT_TITLES - center= on + match:title = ^(Steam Settings)$ + center = on + float = on +} + +windowrule { + name = steam-shutdown + match:class = steam + match:title = ^(Shutdown)$ + center = on float = on } diff --git a/README-ru.md b/README-ru.md index 243f10d..38dadef 100644 --- a/README-ru.md +++ b/README-ru.md @@ -239,7 +239,7 @@ | Клавиши | Действие | | :--------------------------------------------------------- | :------------------------------------------------ | -| Super + Q | Закрыть активное окно | +| Super + Shift + Q | Закрыть активное окно | | F11 | Полный экран (fullscreen) | | Super + A | Максимизировать активное окно | | Super + F | Переключение окна в режим "плавающее" (float) | diff --git a/README.md b/README.md index b99d36e..684831a 100644 --- a/README.md +++ b/README.md @@ -240,7 +240,7 @@ Dynamic tiling Wayland compositor. | Keys | Action | | :-------------------------------------------------------- | :---------------------------------- | -| Super + Q | Close active window | +| Super + Shift + Q | Close active window | | F11 | Fullscreen | | Super + A | Maximize active window | | Super + F | Toggle window to "float" mode | diff --git a/Scripts/install.sh b/Scripts/install.sh index 1d8d496..44dd911 100755 --- a/Scripts/install.sh +++ b/Scripts/install.sh @@ -295,7 +295,7 @@ run_initial_services() { run_service "swaync" swaync -c "$HOME/.config/swaync/config.json" run_service "nm-applet" nm-applet run_service "vicinae" vicinae server - run_service "swww-daemon" swww-daemon + run_service "awww-daemon" awww-daemon run_service "waybar" waybar -c "$HOME/.config/waybar/config.jsonc" -s "$HOME/.config/waybar/styles.css" } @@ -417,7 +417,7 @@ main() { if [[ "$CHOICES" == *"Install System Interface packages"* ]]; then print_section "Installing System Interface packages" - install_pacman hyprlock hypridle kitty nwg-look swaync waybar swww hyprshot + install_pacman hyprlock hypridle kitty nwg-look swaync waybar awww hyprshot install_yay waypaper wlogout vicinae-bin fi