Refactor gui module

nixos/configurations/Akun/default.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   pkgs,
+  outputs,
   ...
 }: {
   imports =
@@ -16,6 +17,8 @@
       ./users
       ./networking.nix
       ./disk-config.nix
+
+      outputs.nixosModules.gui
     ];
 
   youthlic = {

nixos/configurations/Cape/default.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  outputs,
+  ...
+}: {
   imports = [
     ./forgejo.nix
     ./networking.nix
@@ -8,6 +12,8 @@
     ./disko-config.nix
     ./miniflux.nix
     ./radicle.nix
+
+    outputs.nixosModules.default
   ];
 
   youthlic = {

nixos/configurations/Tytonidae/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   inputs,
+  outputs,
   ...
 }: {
   imports =
@@ -24,6 +25,8 @@
       ./hardware.nix
       ./specialisation/kde.nix
       ./specialisation/niri-hybrid.nix
+
+      outputs.nixosModules.gui
     ];
 
   youthlic = {

nixos/modules/default.nix

@@ -1,43 +1,13 @@
 {
-  pkgs,
-  inputs,
-  outputs,
-  ...
-}: {
-  imports =
-    (with inputs; [
-      niri-flake.nixosModules.niri
-      nixos-cosmic.nixosModules.default
-      home-manager.nixosModules.home-manager
-      dae.nixosModules.dae
-      sops-nix.nixosModules.sops
-      stylix.nixosModules.stylix
-      disko.nixosModules.disko
-      lix-module.nixosModules.default
-      chaotic.nixosModules.default
-    ])
-    ++ [
-      ./containers
-      ./deploy
-      ./nix.nix
-      ./home.nix
-      ./sops.nix
-      ./i18n.nix
-      ./gui
-      ./programs
-      ./hardware.nix
-    ];
-
-  config = {
-    nixpkgs = {
-      overlays = with outputs.overlays; [
-        modifications
-        additions
-      ];
-    };
-    system.rebuild.enableNg = true;
-    environment.systemPackages = with pkgs; [
-      deploy-rs
-    ];
-  };
+  imports = [
+    ./containers
+    ./deploy
+    ./nix.nix
+    ./home.nix
+    ./sops.nix
+    ./i18n.nix
+    ./gui
+    ./programs
+    ./hardware.nix
+  ];
 }

nixos/modules/top-level/default.nix

@@ -0,0 +1,31 @@
+{
+  pkgs,
+  inputs,
+  outputs,
+  ...
+}: {
+  imports = with inputs; [
+    home-manager.nixosModules.home-manager
+    dae.nixosModules.dae
+    sops-nix.nixosModules.sops
+    stylix.nixosModules.stylix
+    disko.nixosModules.disko
+    lix-module.nixosModules.default
+    chaotic.nixosModules.default
+
+    ./..
+  ];
+
+  config = {
+    nixpkgs = {
+      overlays = with outputs.overlays; [
+        modifications
+        additions
+      ];
+    };
+    system.rebuild.enableNg = true;
+    environment.systemPackages = with pkgs; [
+      deploy-rs
+    ];
+  };
+}

nixos/modules/top-level/gui.nix

@@ -0,0 +1,9 @@
+{inputs, ...}: {
+  imports =
+    [
+      ./.
+    ]
+    ++ (with inputs; [
+      niri-flake.nixosModules.niri
+    ]);
+}