Commit fbd09f7

HPCesia <me@hpcesia.com>
2025-12-04 09:27:03
fix: noctalia nixos module position
main
1 parent de5ddda
Changed files (3)
modules
desktop
desktop-environment
discrete
shell
noctalia
default.nix
defualt.nix
wm
niri
default.nix
modules/desktop/desktop-environment/discrete/shell/noctalia/default.nix
@@ -1,4 +1,12 @@
 {inputs, ...}: {
+  flake.modules.nixos.de-shell-noctalia = {...}: {
+    imports = [inputs.noctalia.nixosModules.default];
+
+    services.noctalia-shell = {
+      enable = true;
+    };
+  };
+
   flake.modules.homeManager.de-shell-noctalia = {config, ...}: {
     imports = [inputs.noctalia.homeModules.default];
modules/desktop/desktop-environment/discrete/shell/defualt.nix
@@ -1,4 +1,10 @@
 {config, ...}: {
+  flake.modules.nixos.de-shell = _: {
+    imports = with config.flake.modules.homeManager; [
+      de-shell-noctalia
+    ];
+  };
+
   flake.modules.homeManager.de-shell = _: {
     imports = with config.flake.modules.homeManager; [
       de-shell-noctalia
modules/desktop/desktop-environment/discrete/wm/niri/default.nix
@@ -4,10 +4,7 @@
   ...
 }: {
   flake.modules.nixos.wm-niri = {pkgs, ...}: {
-    imports = [
-      inputs.niri-flake.nixosModules.niri
-      inputs.noctalia.nixosModules.default
-    ];
+    imports = [inputs.niri-flake.nixosModules.niri];
 
     nixpkgs.overlays = [
       inputs.niri-flake.overlays.niri
@@ -19,8 +16,6 @@
       enable = true;
       package = pkgs.niri-unstable;
     };
-
-    services.noctalia-shell.enable = true;
   };
 
   flake.modules.homeManager.wm-niri = {