refactor: use flake-parts, change modules structure

1 files changed, 5 insertions, 41 deletions

diff --git a/flake.nix b/flake.nix
index ea5e47c..ca7eced 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,9 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 
+    flake-parts.url = "github:hercules-ci/flake-parts";
+    import-tree.url = "github:vic/import-tree";
+
     nix-darwin.url = "github:nix-darwin/nix-darwin";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -12,8 +15,6 @@
 
     site.url = "github:schererleander/site";
 
-    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
-
     spicetify-nix.url = "github:Gerg-L/spicetify-nix";
 
     nixcord.url = "github:kaylorben/nixcord";
@@ -21,43 +22,6 @@
     firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
   };
 
-  outputs =
-    { ... }@inputs:
-    let
-      linux-system = "x86_64-linux";
-      darwin-system = "aarch64-darwin";
-      username = "schererleander";
-      overlays = [ ];
-      lib = import ./lib { inherit inputs; };
-    in
-    {
-      nixosConfigurations = {
-        adam = lib.mkSystem {
-          host = "adam";
-          username = "schererleander";
-          system = linux-system;
-          overlays = overlays;
-          extraHomeModules = [
-            inputs.nixcord.homeModules.nixcord
-            inputs.spicetify-nix.homeManagerModules.spicetify
-          ];
-        };
-        sachiel = lib.mkSystem {
-          host = "sachiel";
-          username = "administrator";
-          system = linux-system;
-          useHomeManager = false;
-        };
-      };
-      darwinConfigurations.lilith = lib.mkSystem {
-        host = "lilith";
-        username = username;
-        system = darwin-system;
-        overlays = overlays;
-        extraHomeModules = [
-          inputs.nixcord.homeModules.nixcord
-          inputs.spicetify-nix.homeManagerModules.spicetify
-        ];
-      };
-    };
+  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; }
+    (inputs.import-tree ./modules/flake);
 }