flake: remove suites from flake

flake.nix

@@ -106,7 +106,7 @@
             system = "x86_64-linux";
             channelName = "nixos";
             imports = [ (digga.lib.importExportableModules ./modules) ];
-            modules = [
+            modules = let users = digga.lib.rakeLeaves ./users; in [
               # --- DevOS Modules ---
               { lib.our = self.lib; }
               digga.nixosModules.bootstrapIso
@@ -125,87 +125,54 @@
 
               # --- Domain-Specific Modules ---
               inputs.nix-minecraft.nixosModules.minecraft-servers
+
+              # --- Users ---
+              users.root
+              users.infinidoge
             ];
           };
 
           imports = [ (digga.lib.importHosts ./hosts) ];
-          importables = rec {
+          importables = {
-            profiles = digga.lib.rakeLeaves ./profiles // {
-              users = digga.lib.rakeLeaves ./users;
-            };
-            suites = with profiles; self.lib.flattenSetList
-              rec {
-                base = [
-                  (with users; [ root infinidoge ])
-                ];
-
-                develop = [
-                  (with profiles.develop.programming; [
-                    haskell
-                    java
-                    kotlin
-                    lua
-                    nim
-                    python
-                    racket
-                    rust
-                    zig
-                  ])
-                ];
-              };
-
             inherit private;
+            profiles = digga.lib.rakeLeaves ./profiles;
           };
         };
 
-        home = {
+        home =
-          imports = [ (digga.lib.importExportableModules ./users/modules) ];
+          let
-          modules = [
-            inputs.impermanence.nixosModules.home-manager.impermanence
-          ];
-          importables = rec {
-            inherit inputs;
-
             profiles = digga.lib.rakeLeaves ./users/profiles;
-            suites = with profiles; self.lib.flattenSetList
+          in
-              rec {
+          {
-                base = [
+            imports = [ (digga.lib.importExportableModules ./users/modules) ];
-                  # Base Configuration
+            modules = with profiles; [
-                  xdg
+              inputs.impermanence.nixosModules.home-manager.impermanence
 
-                  # Programs
+              # Base Configuration
-                  direnv
+              xdg
-                  git
-                  emacs
-                  vim
-                  gpg
-                  ssh
-                  keychain
 
-                  # Terminal
+              # Programs
-                  starship
+              direnv
-                  shells.all
+              git
-                  tmux
+              emacs
-                ];
+              vim
+              gpg
+              ssh
+              keychain
 
-                graphic = [
+              # Terminal
-                  kitty
+              starship
-                  rofi
+              shells.all
-                  themeing
+              tmux
-                  flameshot
+            ];
-                ];
+            importables = {
-              };
+              inherit inputs profiles;
+            };
           };
-        };
 
         devshell = ./shell;
 
         homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
-
-        templates.default = self.templates.bud;
-        templates.bud.path = ./.;
-        templates.bud.description = "bud template";
-
       }
     //
     {

hosts/Infini-DESKTOP/default.nix

@@ -1,10 +1,5 @@
-{ suites, profiles, pkgs, lib, private, ... }: {
+{ pkgs, lib, private, ... }: {
   imports = lib.lists.flatten [
-    (with suites; [
-      base
-      develop
-    ])
-
     private.nixosModules.wireless
 
     ./hardware-configuration.nix

hosts/Infini-FRAMEWORK/default.nix

@@ -1,13 +1,7 @@
-{ suites, profiles, pkgs, lib, private, ... }: {
+{ pkgs, lib, private, ... }: {
   imports = lib.lists.flatten [
-    (with suites; [ base ])
-
     private.nixosModules.wireless
 
-    (with profiles; [
-      # services.proxy
-    ])
-
     ./hardware-configuration.nix
     ./filesystems.nix
   ];

hosts/Infini-SERVER/default.nix

@@ -1,7 +1,5 @@
-{ config, suites, profiles, pkgs, lib, private, ... }: {
+{ config, pkgs, lib, private, ... }: {
   imports = lib.flatten [
-    (with suites; [ base ])
-
     private.nixosModules.minecraft-servers
     private.nixosModules.nitter
     ./hardware-configuration.nix

hosts/Infini-STICK/default.nix

@@ -1,7 +1,6 @@
-{ lib, suites, profiles, private, ... }: {
+{ lib, private, ... }:
+{
   imports = lib.lists.flatten [
-    (with suites; [ base develop ])
-
     private.nixosModules.wireless
 
     ./hardware-configuration.nix

hosts/Infini-SWIFT/default.nix

@@ -1,11 +1,9 @@
-{ suites, profiles, pkgs, lib, private, ... }: {
+{ pkgs, lib, private, ... }:
-  imports = lib.our.flattenListSet {
+{
-    suites = with suites; [ base develop ];
+  imports = [
-    imports = [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    private.nixosModules.wireless
-      private.nixosModules.wireless
+  ];
-    ];
-  };
 
   system.stateVersion = "21.11";
 

hosts/Infini-WSL/default.nix

@@ -1,11 +1,5 @@
-{ suites, profiles, pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
-  imports = lib.lists.flatten [
+{
-    (with suites; [
-      base
-      develop
-    ])
-  ];
-
   system.stateVersion = "22.05";
 
   # I don't use Windows, but when I do, I want NixOS there with me,

users/infinidoge/default.nix

@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, suites, profiles, inputs, ... }:
+{ config, self, lib, pkgs, profiles, inputs, ... }:
 let
   inherit (lib) flatten optional mkIf;
   ifGraphical = lib.optionals config.info.graphical;
@@ -6,18 +6,30 @@ let
 in
 {
   imports = flatten [
-    (with suites; [ develop ])
+    (with profiles.develop.programming; [
+      haskell
+      java
+      kotlin
+      lua
+      nim
+      python
+      racket
+      rust
+      zig
+    ])
   ];
 
-  home = { config, main, suites, profiles, ... }: {
+  home = { config, main, profiles, ... }: {
     imports = flatten [
-      (with suites; [
-        base
-
-        (ifGraphical' graphic)
-      ])
       (with profiles; [
         htop
+
+        (ifGraphical' [
+          kitty
+          rofi
+          themeing
+          flameshot
+        ])
       ])
 
       ./config

users/root/default.nix

@@ -4,13 +4,7 @@
     openssh.authorizedKeys.keys = import ./ssh-keys.nix;
   };
 
-  home-manager.users.root = { suites, profiles, ... }: {
+  home-manager.users.root = { ... }: {
-    imports = lib.lists.flatten [
-      (with suites; [
-        base
-      ])
-    ];
-
     programs.ssh.matchBlocks = {
       "server.doge-inc.net" = {
         identityFile = "/root/.ssh/id_25519";