suspend fixes

This commit is contained in:
ari committed 2026-09-20 17:16:04 -04:00
1 parent aecd272994
commit 5d727c26cd
9 files changed
+19 -19

No files matched your search

+1 -1
View File
@@ -65,7 +65,7 @@ hypr/
├── inputs.lua # touchpad tap + natural scroll, kb us, hl.gesture
├── window-rules.lua # hl.window_rule floats for small dialogs/utilities
├── keybindings.lua # niri + noctalia binds, scrolling dispatchers (hl.bind/hl.dsp); Mod+Tab toggles the Quickshell overview
└── autostart.lua # noctalia, Quickshell overview, hypridle via setpriv (hl.on hyprland.start; drops compositor caps)
└── autostart.lua # noctalia + Quickshell overview via setpriv (hl.on hyprland.start; drops compositor caps)
```
## Bindings without a clean 1:1 niri mapping
-1
View File
@@ -4,7 +4,6 @@
local function autostart()
hl.exec_cmd("setpriv --ambient-caps -all -- noctalia")
hl.exec_cmd("setpriv --ambient-caps -all -- qs -c overview")
hl.exec_cmd("setpriv --ambient-caps -all -- hypridle")
end
hl.on("hyprland.start", autostart)
hl.bind("SUPER + SHIFT + A", autostart)
-1
View File
@@ -4,7 +4,6 @@ require("conf/cec")
-- Autostart
-- =========================
hl.on("hyprland.start", function()
hl.exec_cmd("setpriv --ambient-caps -all -- hypridle")
hl.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 100%")
hl.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ 0")
Cec.wake_and_switch()
+1 -1
View File
@@ -70,7 +70,7 @@
fileSystems."/mnt/Data" = {
device = "/dev/disk/by-uuid/239db4ac-762d-4d76-8297-ccd37bcdfd8b";
fsType = "ext4";
options = [ "users" "exec" "nofail" ];
options = [ "users" "exec" "nofail" "noauto" "x-systemd.automount" ];
};
fileSystems."/boot" =
{
+3 -2
View File
@@ -26,9 +26,7 @@ in
pipewire.enable = true;
laptop-power-mgr = {
enable = true;
enableLidMonitorMode = true;
enableTempMonitor = true;
disableLidSwitch = true;
};
amdgpu.enable = true;
};
@@ -259,6 +257,9 @@ in
hermenix
]);
# General hardware stuff
systemd.services.NetworkManager-wait-online.enable = false;
systemd.services.systemd-udev-settle.enable = false;
services.usbmuxd.enable = true;
# Tether — iPhone ↔ Linux Wayland bridge
programs.tether = {
@@ -250,9 +250,12 @@ in
} // (if cfg.disableLidSwitch then {
HandleLidSwitch = "ignore";
HandleLidSwitchExternalPower = "ignore";
HandleLidSwitchDocked = "ignore";
} else {
HandleLidSwitch = "suspend";
HandleLidSwitchExternalPower = "suspend";
# Don't suspend when docked to an external screen.
HandleLidSwitchDocked = "ignore";
});
};
};
+10 -10
View File
@@ -44,7 +44,7 @@ skyg.nixos.desktop.tiler.niri.configLink.mountAsSource # bake config into the bu
skyg.nixos.desktop.tiler.niri.touchscreen-gestures.enable # 3/4-finger swipes → niri actions
skyg.nixos.desktop.tiler.hyprland.enable
skyg.nixos.desktop.tiler.hyprland.configName # per-host config dir (default: hostName)
skyg.nixos.desktop.tiler.hyprland.tools.enable # hypridle, wofi, rofi, grim, slurp, satty
skyg.nixos.desktop.tiler.hyprland.tools.enable # wofi, rofi, grim, slurp, satty
skyg.nixos.desktop.tiler.noctalia.enable # standalone noctalia + config symlink
skyg.nixos.desktop.tiler.noctalia.configName # per-host config dir (default: hostName)
skyg.nixos.desktop.tiler.quickshell.enable # qs package + config symlink (e.g. fwbook's overview)
@@ -58,7 +58,7 @@ skyg.nixos.desktop.tiler.background.enable
`xdg-desktop-portal-hyprland` kept in sync), launched via UWSM. It:
- Installs the noctalia shell and autostart-friendly tools (grim/slurp/satty,
wofi/rofi, hypridle, wl-clipboard). There is no waybar/hyprpanel — the shell is noctalia.
wofi/rofi, wl-clipboard). There is no waybar/hyprpanel — the shell is noctalia.
- No Hyprland overview plugin — the scrolling overview is a standalone Quickshell
config (`quickshell.nix`, see below), not a Hyprland plugin.
- Symlinks `~/.config/hypr` -> `configs/<configName>/hypr`, where `configName`
@@ -87,7 +87,7 @@ against tagged releases. Quickshell avoids the plugin-ABI churn entirely.
### Hyprland shell tools (opt-in)
The shell/utility apps that were previously installed unconditionally with Hyprland
(hypridle, wofi, rofi, grim, slurp, satty) are now gated behind
(wofi, rofi, grim, slurp, satty) are now gated behind
`skyg.nixos.desktop.tiler.hyprland.tools.enable`. `wl-clipboard` stays always-on. Hosts
whose Hyprland config actually invokes these (e.g. `fwbook`) enable the flag; a pure
clock box (`hl-pi1`) does not.
@@ -110,18 +110,18 @@ When `skyg.nixos.desktop.tiler.niri.touchscreen-gestures.enable = true`:
### Options
| Option | Default | Notes |
|---|---|---|
| `touchOutput` | `null` | niri output the panel maps to. **Required when more than one output is enabled** — the daemon refuses to start otherwise. Match `touch { map-to-output }` in the niri config. |
| `device` | `null` | Explicit evdev path; auto-detect fails with multiple touchscreens. |
| `threshold` | `60` | Pixels of movement before a swipe registers. |
| `configFile` | `null` | TOML gesture config. Must exist if set — a missing file is fatal, not a fallback to defaults. |
| Option | Default | Notes |
| ------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `touchOutput` | `null` | niri output the panel maps to. **Required when more than one output is enabled** — the daemon refuses to start otherwise. Match `touch { map-to-output }` in the niri config. |
| `device` | `null` | Explicit evdev path; auto-detect fails with multiple touchscreens. |
| `threshold` | `60` | Pixels of movement before a swipe registers. |
| `configFile` | `null` | TOML gesture config. Must exist if set — a missing file is fatal, not a fallback to defaults. |
### Why dotool and not ydotool
Forwarding a tap needs the pointer placed at an absolute position. `ydotool`'s
`mousemove --absolute` does not do that: it emits a warp-to-corner plus a
*relative* delta, so the compositor's pointer acceleration scales it — measured
_relative_ delta, so the compositor's pointer acceleration scales it — measured
at exactly 2x on this host, saturating at the screen edge past ~1440px. niri has
no per-device input config, so accel cannot be flattened for just the virtual
device. `dotool` registers a uinput device with a declared absolute axis range
+1 -2
View File
@@ -24,7 +24,7 @@ in
configType = "hypr";
};
tools = {
enable = lib.mkEnableOption "Hyprland shell tools (hypridle, wofi, rofi, grim, slurp, satty)";
enable = lib.mkEnableOption "Hyprland shell tools (wofi, rofi, grim, slurp, satty)";
};
};
};
@@ -63,7 +63,6 @@ in
environment.systemPackages = with pkgs; [
wl-clipboard
] ++ (lib.optionals cfg.tools.enable [
hypridle
wofi
rofi
grim
-1
View File
@@ -28,7 +28,6 @@ in
enable = true;
};
environment.systemPackages = with pkgs; [
hypridle
swayosd
xwayland-satellite
adwaita-icon-theme