.

flake.nix

@@ -1,6 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
+    nixpkgs = {
+      url = "github:NixOS/nixpkgs?ref=nixos-unstable";
+    };
 
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
@@ -23,59 +25,18 @@
   };
 
   outputs =
-    inputs@{ flake-parts, ... }:
+    inputs@{ flake-parts, self, clan-core, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: {
       systems = [
         "x86_64-linux"
       ];
 
       imports = [
-        inputs.clan-core.flakeModules.default
-        inputs.devshell.flakeModule
-        ./clan.nix
+        clan-core.flakeModules.default
+
+        ./devShells/flake-module.nix
       ];
 
-      perSystem = { system, ... }: {
-        devshells = {
-          default = {
-            packages = [ inputs.clan-core.packages.${system}.clan-cli ];
-          };
-        };
-      };
+      clan = import ./clan.nix;
     });
-
-  # outputs =
-  #   {
-  #     self,
-  #     clan-core,
-  #     nixpkgs,
-  #     ...
-  #   }@inputs:
-  #   let
-  #     # Usage see: https://docs.clan.lol
-  #     clan = clan-core.lib.clan {
-  #       inherit self;
-  #       imports = [ ./clan.nix ];
-  #       specialArgs = { inherit inputs; };
-  #     };
-  #   in
-  #   {
-  #     inherit (clan.config) nixosConfigurations nixosModules clanInternals;
-  #     clan = clan.config;
-  #     # Add the Clan cli tool to the dev shell.
-  #     # Use "nix develop" to enter the dev shell.
-  #     devShells =
-  #       nixpkgs.lib.genAttrs
-  #         [
-  #           "x86_64-linux"
-  #           "aarch64-linux"
-  #           "aarch64-darwin"
-  #           "x86_64-darwin"
-  #         ]
-  #         (system: {
-  #           default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell {
-  #             packages = [ clan-core.packages.${system}.clan-cli ];
-  #           };
-  #         });
-  #   };
 }