simplify modules included in generator

hosts/algiz/default.nix

@@ -1,4 +1,5 @@
 {
+  inputs,
   config,
   enabled,
   enableAttrs,
@@ -6,6 +7,10 @@
   ...
 }:
 {
+  imports = [
+    inputs.comin.nixosModules.comin
+  ];
+
   oizys = {
     rune.motd = enabled;
     languages = "nim|node|python|nushell" |> listify;

lib/generators.nix

@@ -45,11 +45,9 @@ let
     nixosSystem {
       system = "x86_64-linux";
       modules =
-        [
+        []
-          inputs.comin.nixosModules.comin
-        ]
         ++ (selfModules ''oizys'')
-        ++ (nixosModules ''lix-module|hyprland|sops-nix'')
+        ++ (nixosModules ''lix-module|sops-nix'')
         ++ (hostFiles hostName);
 
       specialArgs = commonSpecialArgs // {

modules/desktop/window-managers/hyprland.nix

@@ -1,12 +1,25 @@
 {
+  inputs,
   pkgs,
   config,
-  mkOizysModule,
+  lib,
+  # mkOizysModule,
   enabled,
   flake,
   ...
 }:
-mkOizysModule config "hyprland" {
+let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.oizys.hyprland;
+in
+{
+  imports = [
+    inputs.hyprland.nixosModules.default
+  ];
+
+  options.oizys.hyprland.enable = mkEnableOption "hyprland";
+
+  config = mkIf cfg.enable {
     programs.hyprland = enabled;
     security.pam.services.swaylock = { };
     # Optional, hint electron apps to use wayland:
@@ -65,21 +78,5 @@ mkOizysModule config "hyprland" {
       extraArgs = [ "--skip-login" ];
       loginOptions = "-p -- ${config.oizys.user}";
     };
-
+  };
-  # using the below to autostart Hyprland
-  # broke my keybindings that were working before
-  # environment.etc =
-  #   let
-  #     activate-snippet = ''
-  #       if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
-  #         exec Hyprland
-  #       fi
-  #     '';
-  #   in
-  #   {
-  #     "bashrc.local".text = activate-snippet;
-  #     "zshenv.local".text = activate-snippet;
-  #   };
-  #
-
 }