From 5bc64dfea482dd4fefc587314a2b6e1df73c4e51 Mon Sep 17 00:00:00 2001 From: Adrian G L Date: Tue, 16 Jun 2026 11:27:59 +0200 Subject: [PATCH] fix niri noctalia keybinds, format --- home/niri.nix | 71 ++++++++-------- home/noctalia.nix | 206 ++++++++++++++++++++++++---------------------- 2 files changed, 145 insertions(+), 132 deletions(-) diff --git a/home/niri.nix b/home/niri.nix index 7a5f254..5f536d3 100644 --- a/home/niri.nix +++ b/home/niri.nix @@ -317,25 +317,6 @@ in max-width = 720; } - # Dropdown terminal - { - matches = [ { title = "^dropdown$"; } ]; - open-focused = true; - open-floating = true; - default-floating-position = { - x = 0; - y = 0; - relative-to = "top"; - }; - default-window-height = { - proportion = 0.5; - }; - default-column-width = { - proportion = 0.8; - }; - block-out-from = "screen-capture"; - } - # Foot smaller by default { matches = [ { title = "^foot$"; } ]; @@ -345,6 +326,26 @@ in }; } + #noctalia settings + { + matches = [ + { app-id = "dev.noctalia.Noctalia.Settings"; } + ]; + opacity = 0.9; + open-floating = true; + default-column-width = { + proportion = 0.5; + }; + default-window-height = { + proportion = 0.7; + }; + default-floating-position = { + x = 0; + y = 20; + relative-to = "top"; + }; + } + # Steam notifications { matches = [ @@ -401,8 +402,8 @@ in # Applications "Mod+Return".action.spawn = "footclient"; - "Mod+T".action.spawn = noctalia "plugin togglePanel notes-scratchpad"; - "Mod+A".action.spawn = noctalia "plugin:assistant-panel open"; + #"Mod+T".action.spawn = noctalia "plugin togglePanel notes-scratchpad"; + #"Mod+A".action.spawn = noctalia "plugin:assistant-panel open"; # Noctalia launcher #"Mod+D".action.spawn = noctalia "launcher toggle"; @@ -411,37 +412,41 @@ in "Mod+O".action.toggle-window-rule-opacity = { }; # Noctalia lock screen "Mod+M".action.spawn = noctalia "session lock"; - "Mod+Shift+E".action.spawn = noctalia "sessionMenu toggle"; - "Ctrl+Alt+Delete".action.spawn = noctalia "sessionMenu toggle"; + "Mod+Shift+E".action.spawn = noctalia "panel-toggle session"; + "Ctrl+Alt+Delete".action.spawn = noctalia "panel-toggle session"; # Power off monitors "Mod+Shift+P".action.power-off-monitors = { }; # Noctalia control center - "Mod+N".action.spawn = noctalia "controlCenter toggle"; - "Mod+S".action.spawn = noctalia "settings toggle"; + "Mod+N".action.spawn = noctalia "panel-toggle control-center"; + "Mod+S".action.spawn = noctalia "settings-toggle"; # Volume keys (using Noctalia) "XF86AudioRaiseVolume" = { allow-when-locked = true; - action.spawn = noctalia "volume increase"; + action.spawn = noctalia "volume-up"; }; "XF86AudioLowerVolume" = { allow-when-locked = true; - action.spawn = noctalia "volume decrease"; + action.spawn = noctalia "volume-down"; }; "XF86AudioMute" = { allow-when-locked = true; - action.spawn = noctalia "volume muteOutput"; + action.spawn = noctalia "volume-mute"; }; "XF86AudioMicMute" = { allow-when-locked = true; - action.spawn = noctalia "volume muteInput"; + action.spawn = noctalia "mic-mute"; + }; + "XF86MonBrightnessUp" = { + allow-when-locked = true; + action.spawn = noctalia "brightness-up"; + }; + "XF86MonBrightnessDown" = { + allow-when-locked = true; + action.spawn = noctalia "brightness-down"; }; - - # Brightness keys (using Noctalia) - "XF86MonBrightnessUp".action.spawn = noctalia "brightness increase"; - "XF86MonBrightnessDown".action.spawn = noctalia "brightness decrease"; # Window management "Mod+Shift+Q".action.close-window = { }; diff --git a/home/noctalia.nix b/home/noctalia.nix index 8c4cb09..10930f4 100644 --- a/home/noctalia.nix +++ b/home/noctalia.nix @@ -70,114 +70,122 @@ let "HDMI-A-3" ]; - mkLockscreenWidgets = outputs: let - widgetTemplates = { - "lockscreen-login-box" = { - box_height = 0.0; - box_width = 0.0; - cx = 960.0; - cy = 832.0; - rotation = 0.0; - type = "login_box"; - settings = { - background_opacity = 0.2; - input_opacity = 0.85; - input_radius = 32.0; - show_login_button = true; + mkLockscreenWidgets = + outputs: + let + widgetTemplates = { + "lockscreen-login-box" = { + box_height = 0.0; + box_width = 0.0; + cx = 960.0; + cy = 832.0; + rotation = 0.0; + type = "login_box"; + settings = { + background_opacity = 0.2; + input_opacity = 0.85; + input_radius = 32.0; + show_login_button = true; + }; + }; + + "lockscreen-widget-clock" = { + box_height = 272.0; + box_width = 544.0; + cx = 960.0; + cy = 432.0; + rotation = 0.0; + type = "clock"; + settings = { + background = true; + background_color = "surface_variant"; + background_opacity = 0.20; + background_padding = 0.0; + background_radius = 32.0; + clock_style = "digital"; + color = "primary"; + shadow = true; + }; + }; + + "lockscreen-widget-media" = { + box_height = 288.0; + box_width = 320.0; + cx = 1632.0; + cy = 864.0; + rotation = 0.0; + type = "media_player"; + settings = { + background = false; + hide_when_no_media = true; + layout = "vertical"; + shadow = true; + }; + }; + + "lockscreen-widget-audio" = { + box_height = 288.0; + box_width = 320.0; + cx = 288.0; + cy = 864.0; + rotation = 0.0; + type = "audio_visualizer"; + settings = { + aspect_ratio = 2.5; + background = false; + bands = 32; + low_color = "primary"; + show_when_idle = false; + }; + }; + + "lockscreen-widget-weather" = { + box_height = 112.0; + box_width = 480.0; + cx = 960.0; + cy = 672.0; + rotation = 0.0; + type = "weather"; + settings = { + background = false; + color = "primary"; + }; }; }; - "lockscreen-widget-clock" = { - box_height = 272.0; - box_width = 544.0; - cx = 960.0; - cy = 432.0; - rotation = 0.0; - type = "clock"; - settings = { - background = true; - background_color = "surface_variant"; - background_opacity = 0.20; - background_padding = 0.0; - background_radius = 32.0; - clock_style = "digital"; - color = "primary"; - shadow = true; - }; - }; + widgetIds = builtins.attrNames widgetTemplates; - "lockscreen-widget-media" = { - box_height = 288.0; - box_width = 320.0; - cx = 1632.0; - cy = 864.0; - rotation = 0.0; - type = "media_player"; - settings = { - background = false; - hide_when_no_media = true; - layout = "vertical"; - shadow = true; - }; - }; + perOutput = + output: + let + suffixedId = base: "${base}@${output}"; + in + builtins.listToAttrs ( + map (id: { + name = suffixedId id; + value = widgetTemplates.${id} // { + output = output; + }; + }) widgetIds + ); - "lockscreen-widget-audio" = { - box_height = 288.0; - box_width = 320.0; - cx = 288.0; - cy = 864.0; - rotation = 0.0; - type = "audio_visualizer"; - settings = { - aspect_ratio = 2.5; - background = false; - bands = 32; - low_color = "primary"; - show_when_idle = false; - }; - }; + allWidgets = builtins.foldl' (acc: output: acc // (perOutput output)) { } outputs; - "lockscreen-widget-weather" = { - box_height = 112.0; - box_width = 480.0; - cx = 960.0; - cy = 672.0; - rotation = 0.0; - type = "weather"; - settings = { - background = false; - color = "primary"; - }; + allOrder = builtins.concatLists (map (output: map (id: "${id}@${output}") widgetIds) outputs); + + in + { + enabled = true; + schema_version = 2; + widget_order = allOrder; + grid = { + cell_size = 16; + major_interval = 4; + visible = true; }; + widget = allWidgets; }; - widgetIds = builtins.attrNames widgetTemplates; - - perOutput = output: let - suffixedId = base: "${base}@${output}"; - in builtins.listToAttrs (map (id: { - name = suffixedId id; - value = widgetTemplates.${id} // { output = output; }; - }) widgetIds); - - allWidgets = builtins.foldl' (acc: output: acc // (perOutput output)) {} outputs; - - allOrder = builtins.concatLists (map (output: - map (id: "${id}@${output}") widgetIds - ) outputs); - - in { - enabled = true; - schema_version = 2; - widget_order = allOrder; - grid = { - cell_size = 16; - major_interval = 4; - visible = true; - }; - widget = allWidgets; - }; - in {