version bump + bind fixes
This commit is contained in:
1 parent
7d10ad7d61
commit
060d427d04
8 files changed
+923
-935
No files matched your search
@@ -109,10 +109,22 @@ hl.bind(
|
|||||||
|
|
||||||
-- Media & brightness
|
-- Media & brightness
|
||||||
hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"))
|
hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"))
|
||||||
hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("noctalia msg volume-up"), { locked = true })
|
hl.bind(
|
||||||
hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("noctalia msg volume-down"), { locked = true })
|
"XF86AudioRaiseVolume",
|
||||||
hl.bind("XF86AudioMute", hl.dsp.exec_cmd("noctalia msg volume-mute"), { locked = true })
|
hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"),
|
||||||
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("noctalia msg brightness-up"), { locked = true })
|
{ locked = true }
|
||||||
hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("noctalia msg brightness-down"), { locked = true })
|
)
|
||||||
|
hl.bind(
|
||||||
|
"XF86AudioLowerVolume",
|
||||||
|
hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),
|
||||||
|
{ locked = true }
|
||||||
|
)
|
||||||
|
hl.bind(
|
||||||
|
"XF86AudioMute",
|
||||||
|
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
|
||||||
|
{ locked = true }
|
||||||
|
)
|
||||||
|
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl set 5%+"), { locked = true })
|
||||||
|
hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl set 5%-"), { locked = true })
|
||||||
|
|
||||||
hl.bind(mod .. " + M", hl.dsp.exec_cmd("nu ~/.config/hypr/speak-selection.nu"))
|
hl.bind(mod .. " + M", hl.dsp.exec_cmd("nu ~/.config/hypr/speak-selection.nu"))
|
||||||
@@ -7,7 +7,4 @@ binds {
|
|||||||
Mod+Alt+L hotkey-overlay-title="Notifications: Clear" { spawn "noctalia" "msg" "notification-clear-active"; }
|
Mod+Alt+L hotkey-overlay-title="Notifications: Clear" { spawn "noctalia" "msg" "notification-clear-active"; }
|
||||||
|
|
||||||
Mod+P { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; }
|
Mod+P { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; }
|
||||||
|
|
||||||
XF86MonBrightnessUp allow-when-locked=true { spawn "noctalia" "msg" "brightness-up"; }
|
|
||||||
XF86MonBrightnessDown allow-when-locked=true { spawn "noctalia" "msg" "brightness-down"; }
|
|
||||||
}
|
}
|
||||||
@@ -53,10 +53,12 @@ binds {
|
|||||||
Mod+Shift+Space allow-when-locked=true { spawn "playerctl" "play-pause"; }
|
Mod+Shift+Space allow-when-locked=true { spawn "playerctl" "play-pause"; }
|
||||||
Mod+Shift+M allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
|
Mod+Shift+M allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
|
||||||
Mod+Shift+S allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
|
Mod+Shift+S allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
|
||||||
XF86AudioRaiseVolume allow-when-locked=true { spawn "playerctl" "volume" "0.1+"; }
|
XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%+"; }
|
||||||
XF86AudioLowerVolume allow-when-locked=true { spawn "playerctl" "volume" "0.1-"; }
|
XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%-"; }
|
||||||
XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
|
XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
|
||||||
XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
|
XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
|
||||||
|
XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "set" "5%+"; }
|
||||||
|
XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "set" "5%-"; }
|
||||||
|
|
||||||
// =========================
|
// =========================
|
||||||
// Resizing
|
// Resizing
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
Generated
+5
-5
@@ -2021,12 +2021,12 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789546076,
|
"lastModified": 1790046670,
|
||||||
"narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=",
|
"narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=",
|
||||||
"rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
|
"rev": "6774f7bc253789b113a4f39285dc0fa100abeacc",
|
||||||
"revCount": 1074753,
|
"revCount": 1077996,
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1074753%2Brev-b1b875982b17dabde9b4a37f3e229e74913e6db3/01a0abaa-ae2e-7230-bd71-cbc4ff564bff/source.tar.gz"
|
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1077996%2Brev-6774f7bc253789b113a4f39285dc0fa100abeacc/01a0c94d-28a5-7a40-942a-90dd6346f0c2/source.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ tiler/
|
|||||||
├── niri.nix # skyg.nixos.desktop.tiler.niri — niri compositor (sets tiler.enable)
|
├── niri.nix # skyg.nixos.desktop.tiler.niri — niri compositor (sets tiler.enable)
|
||||||
├── niri-touchscreen-gestures.nix # skyg.nixos.desktop.tiler.niri.touchscreen-gestures — touchscreen swipe support
|
├── niri-touchscreen-gestures.nix # skyg.nixos.desktop.tiler.niri.touchscreen-gestures — touchscreen swipe support
|
||||||
├── hyprland.nix # skyg.nixos.desktop.tiler.hyprland — Hyprland via flake (sets tiler.enable)
|
├── hyprland.nix # skyg.nixos.desktop.tiler.hyprland — Hyprland via flake (sets tiler.enable)
|
||||||
├── noctalia.nix # skyg.nixos.desktop.tiler.noctalia — noctalia shell + per-host config symlink
|
├── noctalia.nix # skyg.nixos.desktop.tiler.noctalia — noctalia shell + per-host config symlink; libqalculate pinned from nixpkgs-unstable (stable 5.10.0 segfaults on teardown)
|
||||||
├── quickshell.nix # skyg.nixos.desktop.tiler.quickshell — qs package + per-host config symlink
|
├── quickshell.nix # skyg.nixos.desktop.tiler.quickshell — qs package + per-host config symlink
|
||||||
└── swww.nix # skyg.nixos.desktop.tiler.background — swww/waypaper wallpaper tools
|
└── swww.nix # skyg.nixos.desktop.tiler.background — swww/waypaper wallpaper tools
|
||||||
```
|
```
|
||||||
@@ -59,6 +59,11 @@ skyg.nixos.desktop.tiler.background.enable
|
|||||||
|
|
||||||
- Installs the noctalia shell and autostart-friendly tools (grim/slurp/satty,
|
- Installs the noctalia shell and autostart-friendly tools (grim/slurp/satty,
|
||||||
wofi/rofi, wl-clipboard). There is no waybar/hyprpanel — the shell is noctalia.
|
wofi/rofi, wl-clipboard). There is no waybar/hyprpanel — the shell is noctalia.
|
||||||
|
- `noctalia.nix` overrides Noctalia's `libqalculate` to the `nixpkgs-unstable`
|
||||||
|
build (5.12.0). Stable 26.05 ships 5.10.0, which segfaults in `clear_randstate`
|
||||||
|
on every teardown where the launcher calculator was never used (fixed upstream
|
||||||
|
in 5.11.0). Only that one dep moves to unstable; the rest of Noctalia stays on
|
||||||
|
stable. Drop the override once stable carries >= 5.11.0.
|
||||||
- No Hyprland overview plugin — the scrolling overview is a standalone Quickshell
|
- No Hyprland overview plugin — the scrolling overview is a standalone Quickshell
|
||||||
config (`quickshell.nix`, see below), not a Hyprland plugin.
|
config (`quickshell.nix`, see below), not a Hyprland plugin.
|
||||||
- Symlinks `~/.config/hypr` -> `configs/<configName>/hypr`, where `configName`
|
- Symlinks `~/.config/hypr` -> `configs/<configName>/hypr`, where `configName`
|
||||||
|
|||||||
@@ -3,12 +3,23 @@
|
|||||||
, pkgs
|
, pkgs
|
||||||
, skygUtils
|
, skygUtils
|
||||||
, noctalia
|
, noctalia
|
||||||
|
, unstablePkgs
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
cfg = config.skyg.nixos.desktop.tiler.noctalia;
|
cfg = config.skyg.nixos.desktop.tiler.noctalia;
|
||||||
system = pkgs.stdenv.hostPlatform.system;
|
system = pkgs.stdenv.hostPlatform.system;
|
||||||
noctaliaPkg = noctalia.packages.${system}.default;
|
# Pull libqalculate from nixpkgs-unstable: stable 26.05 ships 5.10.0, which
|
||||||
|
# segfaults in clear_randstate on Noctalia teardown when the launcher
|
||||||
|
# calculator was never used. The null-check landed in 5.11.0 (unstable has it).
|
||||||
|
# callPackage already folded libqalculate into buildInputs, so swap that entry.
|
||||||
|
noctaliaPkg =
|
||||||
|
let base = noctalia.packages.${system}.default; in
|
||||||
|
base.overrideAttrs (old: {
|
||||||
|
buildInputs = lib.map
|
||||||
|
(p: if p.pname == "libqalculate" then unstablePkgs.libqalculate else p)
|
||||||
|
old.buildInputs;
|
||||||
|
});
|
||||||
bakedConfig = skygUtils.bakeConfig {
|
bakedConfig = skygUtils.bakeConfig {
|
||||||
configName = cfg.configLink.name;
|
configName = cfg.configLink.name;
|
||||||
configType = "noctalia";
|
configType = "noctalia";
|
||||||
|
|||||||
Binary file not shown.
Reference in new issue
Block a user