From 7f1b8b5d382b950be36b841f1d10a0e1316ec89e Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Wed, 28 Feb 2024 23:40:50 +0100
Subject: [PATCH] Remove flake-parts

---
 flake.lock        | 21 ---------------------
 flake.nix         | 17 ++++-------------
 hosts/default.nix | 15 ++++++---------
 3 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/flake.lock b/flake.lock
index 175fa65..c9f8407 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,5 @@
 {
   "nodes": {
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1706830856,
-        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1708655239,
@@ -38,7 +18,6 @@
     },
     "root": {
       "inputs": {
-        "flake-parts": "flake-parts",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 7cc98cb..add061a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,19 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
-    };
   };
 
-  outputs = {nixpkgs, ...} @ inputs:
-    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = ["x86_64-linux"];
-
-      imports = [
-        ./hosts
-      ];
-    };
+  outputs = {self, nixpkgs, ...} @ inputs: let
+  in {
+    nixosConfigurations = import ./hosts {inherit nixpkgs inputs self;};
+  };
 }
diff --git a/hosts/default.nix b/hosts/default.nix
index 8d07a66..dc46717 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,11 +1,8 @@
-{self, inputs, ...}: {
-  flake.nixosConfigurations = let
-    inherit (inputs.nixpkgs.lib) nixosSystem;
-    specialArgs = {inherit inputs self;};
-  in {
-    vboxnix = nixosSystem {
-      inherit specialArgs;
-      modules = [ ../system ./vbox_nix ];
-    };
+{self, inputs, ...}: let
+  inherit (inputs.nixpkgs) lib;
+in {
+  vboxnix = lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [ ../system ./vbox_nix ];
   };
 }