From 351356d575c248eb93667199610e0b0983cf9171 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Wed, 22 Apr 2026 20:37:29 +1000 Subject: [PATCH] more dendritic work --- modules/features/niri.nix | 11 +++++++++-- modules/features/noctalia.nix | 19 +++---------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/modules/features/niri.nix b/modules/features/niri.nix index e4202c2..32613d3 100644 --- a/modules/features/niri.nix +++ b/modules/features/niri.nix @@ -8,23 +8,30 @@ }; perSystem = { pkgs, lib, self',... }: { - packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap { inherit pkgs; settings = { + xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite; + spawn-at-startup = [ # Makes our custom noctalia a dependency and spawns it at startup (lib.getExe self'.packages.myNoctalia) ]; + input.keyboard.xkb.layout = "us"; + binds = { + # Terminal bind + "Mod+Return".spawn-sh = lib.getExe self'.packages.myKitty; + # Launcher bind "Mod+Tab".spawn-sh = "${lib.getExe self.packages.myNoctalia} ipc call launcher toggle"; + # Window control binds + "Mod+Q".close-window = null; }; layout = { gaps = 5; - foo = 20; }; }; diff --git a/modules/features/noctalia.nix b/modules/features/noctalia.nix index 024f5cc..ce53fd5 100644 --- a/modules/features/noctalia.nix +++ b/modules/features/noctalia.nix @@ -1,24 +1,11 @@ { self, inputs, ... }: { - flake.nixosModules.niri = { pkgs, lib, ... }: { - programs.noctalia-shell = { - enable = true; - package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNoctalia; - }; - }; - perSystem = { pkgs, ... }: { - packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap { inherit pkgs; - settings = { - foo = bar; - foorbar = { - bar = true; - foo = "always"; - barbar = 5; - }; - }; + settings = (builtins.fromJSON (builtins.readFile + ./noctalia.json + )).settings; }; };