wrapped versions of niri and noctalia

modules/features/niri.nix

@@ -6,26 +6,45 @@
     };
   };
 
-  perSystem = { pkgs, lib, self', ... }: {
+  perSystem = { pkgs, lib, self', ... }:
-    packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap {
+    let
-      inherit pkgs;
+      nixGLPackage = inputs.nixgl.packages.${pkgs.stdenv.hostPlatform.system}.nixGLIntel;
-      settings = {
+      myNiriUnwrapped = inputs.wrapper-modules.wrappers.niri.wrap {
-        spawn-at-startup = [
+        inherit pkgs;
-          (lib.getExe self'.packages.myNoctalia)
+        settings = {
-        ];
+          spawn-at-startup = [
+            (lib.getExe self'.packages.myNoctalia)
+          ];
 
-        xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
+          xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
 
-        input.keyboard.xkb.layout = "us,ua";
+          input.keyboard.xkb.layout = "us,ua";
 
-        layout.gaps = 5;
+          layout.gaps = 5;
 
-        binds = {
+          binds = {
-          "Mod+Return".spawn-sh = lib.getExe pkgs.kitty;
+            "Mod+Return".spawn-sh = lib.getExe pkgs.kitty;
-          "Mod+Q".close-window = null;
+            # "Mod+Q".close-window = null;
-          "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
+            "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
+          };
         };
       };
+    in {
+      packages.myNiri = pkgs.symlinkJoin {
+        name = "my-niri-nixgl";
+        paths = [ myNiriUnwrapped ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        meta.mainProgram = "niri";
+        postBuild = ''
+          for exe in "$out"/bin/*; do
+            if [[ -f "$exe" ]]; then
+              base="$(basename "$exe")"
+              mv "$exe" "$out/bin/.''${base}-real"
+              makeWrapper ${lib.getExe nixGLPackage} "$exe" \
+                --add-flags "$out/bin/.''${base}-real"
+            fi
+          done
+        '';
+      };
     };
-  };
 }

modules/features/noctalia.nix

@@ -1,10 +1,29 @@
 { self, inputs, ... }: {
-  perSystem = { pkgs, ... }: {
+  perSystem = { pkgs, lib, ... }:
-    packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
+    let
-      inherit pkgs; # THIS PART IS VERY IMPORTAINT, I FORGOT IT IN THE VIDEO!!!
+      nixGLPackage = inputs.nixgl.packages.${pkgs.stdenv.hostPlatform.system}.nixGLIntel;
-      settings =
+      myNoctaliaUnwrapped = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
-        (builtins.fromJSON
+        inherit pkgs;
-          (builtins.readFile ./noctalia.json)).settings;
+        # settings =
+        #   (builtins.fromJSON
+        #     (builtins.readFile ./noctalia.json)).settings;
+      };
+    in {
+      packages.myNoctalia = pkgs.symlinkJoin {
+        name = "my-noctalia-nixgl";
+        paths = [ myNoctaliaUnwrapped ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        meta.mainProgram = "noctalia-shell";
+        postBuild = ''
+          for exe in "$out"/bin/*; do
+            if [[ -f "$exe" ]]; then
+              base="$(basename "$exe")"
+              mv "$exe" "$out/bin/.''${base}-real"
+              makeWrapper ${lib.getExe nixGLPackage} "$exe" \
+                --add-flags "$out/bin/.''${base}-real"
+            fi
+          done
+        '';
+      };
     };
-  };
 }

modules/programs/niri.nix

@@ -1,28 +0,0 @@
-{ self, inputs, ... }: {
-  flake.modules.nixos.niri = { pkgs, lib, ... }: {
-    programs.niri = {
-      enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
-    };
-  };
-
-  perSystem = { pkgs, lib, self', ... }: {
-    packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap {
-      inherit pkgs;
-      env.RUST_BACKTRACE = "full";
-      settings = {
-        spawn-at-startup = [
-          "${lib.getExe self'.packages.myNoctalia}"
-        ];
-        xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
-        input.keyboard.xkb.layout = "us,ua";
-        layout.gaps = 5;
-        binds = {
-          "Mod+Return".spawn-sh = lib.getExe pkgs.ghostty;
-          "Mod+Q".close-window = null;
-          "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
-        };
-      };
-    };
-  };
-}

modules/programs/noctalia.nix

@@ -1,8 +0,0 @@
-{ self, inputs, ... }: {
-  perSystem = { pkgs, ... }: {
-    packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
-      inherit pkgs;
-      # settings = (builtins.fromJSON (builtins.readFile ./noctalia.json)).settings;
-    };
-  };
-}