Drop the remaining sway references
lock.sh no longer falls back to swaylock (hyprlock instead), and the comments in hyprland.lua and the README no longer mention sway. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -99,7 +99,7 @@ DMS (Plugins) или создайте `~/.config/dms/plugin_settings.json` с `{
|
|||||||
|
|
||||||
* В `hypr/hyprland.lua` имена мониторов (`eDP-1`, `HDMI-A-1`) и масштаб 1.25 — под конкретный ноутбук.
|
* В `hypr/hyprland.lua` имена мониторов (`eDP-1`, `HDMI-A-1`) и масштаб 1.25 — под конкретный ноутбук.
|
||||||
* Раскладка (`us,ru`, переключение Alt+Shift), чувствительность тачпада и мыши — там же, в блоке `input`.
|
* Раскладка (`us,ru`, переключение Alt+Shift), чувствительность тачпада и мыши — там же, в блоке `input`.
|
||||||
* Блокировку экрана делает DMS через `hypr/scripts/lock.sh` (с запасным вариантом swaylock).
|
* Блокировку экрана делает DMS через `hypr/scripts/lock.sh` (если DMS не запущен, запасной вариант — hyprlock).
|
||||||
|
|
||||||
## Обновление репозитория
|
## Обновление репозитория
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -1,5 +1,5 @@
|
|||||||
-- Hyprland 0.57 (Lua). Clean dark work setup; shell = DankMaterialShell.
|
-- Hyprland 0.57 (Lua). Clean dark work setup; shell = DankMaterialShell.
|
||||||
-- Sway config stays in ~/.config/sway as a fallback session.
|
-- Fallback login session: GNOME (via GDM).
|
||||||
|
|
||||||
local terminal = "kitty"
|
local terminal = "kitty"
|
||||||
local mod = "SUPER"
|
local mod = "SUPER"
|
||||||
@@ -25,7 +25,7 @@ hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto")
|
|||||||
hl.on("hyprland.start", function()
|
hl.on("hyprland.start", function()
|
||||||
hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP XDG_SESSION_TYPE")
|
hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP XDG_SESSION_TYPE")
|
||||||
hl.exec_cmd("systemctl --user import-environment WAYLAND_DISPLAY DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP XDG_SESSION_TYPE")
|
hl.exec_cmd("systemctl --user import-environment WAYLAND_DISPLAY DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP XDG_SESSION_TYPE")
|
||||||
-- portals (file pickers, screen sharing, Nautilus) need graphical-session.target; sway had sway-session.target for this
|
-- portals (file pickers, screen sharing, Nautilus) need graphical-session.target, which is not started outside uwsm
|
||||||
hl.exec_cmd("systemctl --user start hyprland-session.target")
|
hl.exec_cmd("systemctl --user start hyprland-session.target")
|
||||||
hl.exec_cmd("sh -c 'pgrep -x dms >/dev/null || exec dms run'")
|
hl.exec_cmd("sh -c 'pgrep -x dms >/dev/null || exec dms run'")
|
||||||
hl.exec_cmd("systemctl --user start hyprpolkitagent")
|
hl.exec_cmd("systemctl --user start hyprpolkitagent")
|
||||||
@@ -116,7 +116,7 @@ hl.animation({ leaf = "layersOut", enabled = true, speed = 1.0, bezier = "quic
|
|||||||
hl.animation({ leaf = "workspaces", enabled = true, speed = 3.0, bezier = "easeInOutCubic", style = "slide" })
|
hl.animation({ leaf = "workspaces", enabled = true, speed = 3.0, bezier = "easeInOutCubic", style = "slide" })
|
||||||
hl.animation({ leaf = "specialWorkspace", enabled = true, speed = 2.8, bezier = "easeOutQuint", style = "slidevert" })
|
hl.animation({ leaf = "specialWorkspace", enabled = true, speed = 2.8, bezier = "easeOutQuint", style = "slidevert" })
|
||||||
|
|
||||||
-- No gaps/border/rounding for a single tiled window (sway smart_gaps equivalent).
|
-- No gaps/border/rounding for a single tiled window.
|
||||||
hl.workspace_rule({ workspace = "w[tv1]", gaps_out = 0, gaps_in = 0 })
|
hl.workspace_rule({ workspace = "w[tv1]", gaps_out = 0, gaps_in = 0 })
|
||||||
hl.workspace_rule({ workspace = "f[1]", gaps_out = 0, gaps_in = 0 })
|
hl.workspace_rule({ workspace = "f[1]", gaps_out = 0, gaps_in = 0 })
|
||||||
hl.window_rule({ name = "smart-gaps-1", match = { float = false, workspace = "w[tv1]" }, border_size = 0, rounding = 0 })
|
hl.window_rule({ name = "smart-gaps-1", match = { float = false, workspace = "w[tv1]" }, border_size = 0, rounding = 0 })
|
||||||
@@ -129,7 +129,7 @@ hl.config({
|
|||||||
input = {
|
input = {
|
||||||
kb_layout = "us,ru",
|
kb_layout = "us,ru",
|
||||||
kb_options = "grp:alt_shift_toggle,grp_led:scroll",
|
kb_options = "grp:alt_shift_toggle,grp_led:scroll",
|
||||||
follow_mouse = 2, -- click to focus, like sway's focus_follows_mouse no
|
follow_mouse = 2, -- click to focus; the cursor can still cross other windows
|
||||||
sensitivity = -0.5,
|
sensitivity = -0.5,
|
||||||
touchpad = {
|
touchpad = {
|
||||||
natural_scroll = true,
|
natural_scroll = true,
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Lock with DankMaterialShell (matches the shell theme). Fall back to swaylock-effects / swaylock
|
# Lock the screen with DankMaterialShell (matches the shell theme); hyprlock only if DMS is not running.
|
||||||
# when DMS is not running or the IPC call fails.
|
pgrep -x hyprlock >/dev/null && exit 0
|
||||||
pgrep -x swaylock >/dev/null && exit 0
|
|
||||||
if pgrep -x dms >/dev/null && timeout 3 dms ipc call lock lock >/dev/null 2>&1; then
|
if pgrep -x dms >/dev/null && timeout 3 dms ipc call lock lock >/dev/null 2>&1; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
fx=$HOME/.local/bin/swaylock-effects
|
command -v hyprlock >/dev/null && exec hyprlock
|
||||||
if [ -x "$fx" ]; then
|
exit 1
|
||||||
exec "$fx" -f -C "$HOME/.config/swaylock/config-effects"
|
|
||||||
fi
|
|
||||||
exec swaylock -f
|
|
||||||
|
|||||||
Reference in New Issue
Block a user