From 6f63f5a46f0d2cc0819d952a19a36c60cd88ce74 Mon Sep 17 00:00:00 2001
From: Natasha Moongrave <natasha@256phi.eu>
Date: Thu, 18 Jun 2026 22:29:55 +0200
Subject: Moved niri and noctalia back to feature

Deleted highLevel and moved lowLevel to system
---
 modules/features/highLevel/niri.nix     | 44 ---------------------------------
 modules/features/highLevel/noctalia.nix | 14 -----------
 modules/features/niri.nix               | 44 +++++++++++++++++++++++++++++++++
 modules/features/noctalia.nix           | 14 +++++++++++
 4 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 modules/features/highLevel/niri.nix
 delete mode 100644 modules/features/highLevel/noctalia.nix
 create mode 100644 modules/features/niri.nix
 create mode 100644 modules/features/noctalia.nix

diff --git a/modules/features/highLevel/niri.nix b/modules/features/highLevel/niri.nix
deleted file mode 100644
index 312ba10..0000000
--- a/modules/features/highLevel/niri.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.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;
-      settings = {
-        spawn-at-startup = [
-          (lib.getExe self'.packages.myNoctalia)
-        ];
-
-        xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
-
-        input.keyboard.xkb.layout = "cz-qwertz";
-
-        layout.gaps = 5;
-
-        binds = {
-          "Mod+Return".spawn-sh = lib.getExe pkgs.alacritty;
-          "Mod+Shift+Q".close-window = null;
-          "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/features/highLevel/noctalia.nix b/modules/features/highLevel/noctalia.nix
deleted file mode 100644
index 7b4cd7d..0000000
--- a/modules/features/highLevel/noctalia.nix
+++ /dev/null
@@ -1,14 +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;
-    };
-  };
-}
diff --git a/modules/features/niri.nix b/modules/features/niri.nix
new file mode 100644
index 0000000..312ba10
--- /dev/null
+++ b/modules/features/niri.nix
@@ -0,0 +1,44 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.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;
+      settings = {
+        spawn-at-startup = [
+          (lib.getExe self'.packages.myNoctalia)
+        ];
+
+        xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
+
+        input.keyboard.xkb.layout = "cz-qwertz";
+
+        layout.gaps = 5;
+
+        binds = {
+          "Mod+Return".spawn-sh = lib.getExe pkgs.alacritty;
+          "Mod+Shift+Q".close-window = null;
+          "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/features/noctalia.nix b/modules/features/noctalia.nix
new file mode 100644
index 0000000..7b4cd7d
--- /dev/null
+++ b/modules/features/noctalia.nix
@@ -0,0 +1,14 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  perSystem = {pkgs, ...}: {
+    packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
+      inherit pkgs;
+      settings =
+        (builtins.fromJSON
+          (builtins.readFile ./noctalia.json)).settings;
+    };
+  };
+}
-- 
cgit v1.2.3