diff --git a/configs/fwbook/hypr/ABOUTME.md b/configs/fwbook/hypr/ABOUTME.md index bb91890..457dc63 100644 --- a/configs/fwbook/hypr/ABOUTME.md +++ b/configs/fwbook/hypr/ABOUTME.md @@ -27,7 +27,10 @@ split under `conf/` and pulled in with `require()`. - **Layout:** Hyprland's native `scrolling` layout (0.54+), no plugins required. This mirrors niri's scrollable-tiling model. See `conf/general.lua`. - **Shell:** noctalia (`noctalia-shell`), autostarted in `conf/autostart.lua` - via `hl.on("hyprland.start", ...)`. There is intentionally no waybar/hyprpanel. + via `hl.on("hyprland.start", ...)`. Launched with `setpriv --ambient-caps -all` + to drop capabilities inherited from the compositor; without it, D-Bus calls + inside quickshell-based apps fail silently (hyprwm/Hyprland#14844). There is + intentionally no waybar/hyprpanel. - **Keybinds:** `conf/keybindings.lua` mirrors `configs/niri/shared/binds.kdl` and `configs/niri/noctalia/binds.kdl` as closely as Hyprland allows. - **Overview:** there is no native Hyprland overview, and no overview plugin that @@ -54,7 +57,7 @@ everything else stays on Hyprland defaults. Other `workspaces` styles available: ├── 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) - └── autostart.lua # noctalia, hypridle via UWSM (hl.on hyprland.start) + └── autostart.lua # noctalia, hypridle via setpriv (hl.on hyprland.start; drops compositor caps) ``` ## Bindings without a clean 1:1 niri mapping diff --git a/configs/fwbook/hypr/conf/autostart.lua b/configs/fwbook/hypr/conf/autostart.lua index c8bcb51..92d5ae0 100644 --- a/configs/fwbook/hypr/conf/autostart.lua +++ b/configs/fwbook/hypr/conf/autostart.lua @@ -6,7 +6,9 @@ hl.on("hyprland.start", function() -- noctalia shell (bar / launcher / control center / notifications) - hl.exec_cmd("uwsm app -- noctalia-shell") + -- setpriv drops ambient capabilities inherited from the compositor; + -- without it, D-Bus calls inside quickshell-based apps fail silently. + hl.exec_cmd("setpriv --ambient-caps -all -- noctalia-shell") -- Idle management - hl.exec_cmd("uwsm app -- hypridle") + hl.exec_cmd("setpriv --ambient-caps -all -- hypridle") end) diff --git a/configs/niri/noctalia/binds.kdl b/configs/fwbook/noctalia/binds.kdl similarity index 100% rename from configs/niri/noctalia/binds.kdl rename to configs/fwbook/noctalia/binds.kdl diff --git a/configs/niri/noctalia/index.kdl b/configs/fwbook/noctalia/index.kdl similarity index 100% rename from configs/niri/noctalia/index.kdl rename to configs/fwbook/noctalia/index.kdl diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index f147fee..09155a9 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -3,7 +3,6 @@ , lib , user , unstablePkgs -, noctalia , claude-desktop , flox , ... @@ -15,7 +14,7 @@ let 8000 8001 ]; - noctaliaPkg = noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default; + in { # Skyg @@ -44,6 +43,7 @@ in tiler = { enable = true; hyprland.enable = true; + noctalia.enable = true; niri = { enable = true; touchscreen-gestures = { @@ -218,9 +218,6 @@ in # Iphone Management idevicerestore # optional, to mount using 'ifuse' - # Misc - noctaliaPkg - # coding agents claude-desktop grok-cli diff --git a/modules/nixos/desktop/tiler/default.nix b/modules/nixos/desktop/tiler/default.nix index e2a05ba..4b4205e 100644 --- a/modules/nixos/desktop/tiler/default.nix +++ b/modules/nixos/desktop/tiler/default.nix @@ -12,6 +12,7 @@ in ./hyprland.nix ./niri.nix ./niri-touchscreen-gestures.nix + ./noctalia.nix ./swww.nix ]; options = { diff --git a/modules/nixos/desktop/tiler/noctalia.nix b/modules/nixos/desktop/tiler/noctalia.nix new file mode 100644 index 0000000..24e8123 --- /dev/null +++ b/modules/nixos/desktop/tiler/noctalia.nix @@ -0,0 +1,38 @@ +{ config +, lib +, pkgs +, skygUtils +, noctalia +, ... +}: +let + cfg = config.skyg.nixos.desktop.tiler.noctalia; + system = pkgs.stdenv.hostPlatform.system; + noctaliaPkg = noctalia.packages.${system}.default; +in +{ + options = { + skyg.nixos.desktop.tiler.noctalia = { + enable = lib.mkEnableOption "noctalia"; + configName = lib.mkOption { + type = lib.types.str; + default = config.skyg.core.hostName; + description = '' + Name of the per-host noctalia config directory under `configs/`. + The module symlinks `~/.config/noctalia` -> `configs//noctalia`. + Defaults to the machine's hostName (e.g. `fwbook` -> `configs/fwbook/noctalia`). + ''; + }; + }; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ noctaliaPkg ]; + + # Symlink ~/.config/noctalia -> configs//noctalia (host-specific). + system.userActivationScripts.noctaliaCfg.text = skygUtils.makeHyperlinkScriptToConfigs { + filePath = "${cfg.configName}/noctalia"; + targetPath = "noctalia"; + configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; + }; + }; +}