From 1801e6f02e7cbd4eed1c4887112e72c0997ec505 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Fri, 28 Jul 2023 18:08:32 +1200
Subject: [PATCH] updated flake, still don't know what i'm doing...

---
 flake.nix | 50 +++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7b5e0d0..472fecd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,42 +3,34 @@
         nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
         home-manager.url = "github:nix-community/home-manager";
         home-manager.inputs.nixpkgs.follows = "nixpkgs";
+        hardware.url = "github:nixos/nixos-hardware";
         nix-colors.url = "github:misterio77/nix-colors";
     };
 
-    outputs = {  nixpkgs, home-manager, ... }:
+    outputs = {   self, nixpkgs, home-manager, ... }:
     let
-        system = "x86_64-linux";
-        pkgs = import nixpkgs {
-            inherit system;
-            config = {
-                allowUnfree = true;
-            };
-        };
+      system = "x86_64-linux";
+      lib = nixpkgs.lib // home-manager.lib;
+      pkgsFor = nixpkgs.legacyPackages;
     in
     {
-        homeConfigurations = {
-            ooks = home-manager.lib.homeManagerConfiguration {
-                pkgs = nixpkgs.legacyPackages.x86_64-linux;
-                extraSpecialArgs = { inherit inputs outputs; };
-                modules = [
-                    ./home/ooks/home.nix 
-                ];
-            };
+      inherit lib;
+      nixosConfigurations = {
+        # X1 Carbon
+        ooksx1 =  lib.nixosSystem {
+          inherit system;
+          modules = [ ./system/ooksx1/ ];
+          specialArgs = { inherit inputs outputs; };
         };
-        nixosConfigurations = {
-            ooksthink = nixpkgs.lib.nixosSystem {
-                inherit system;
-                modules = [
-                    ./systems/laptop/laptop.nix
-                ];
-            };
-            ooksdesk = nixpkgs.lib.nixosSystem {
-                inherit system;
-                modules = [
-                    ./systems/desktop/configuration.nix
-                ];
-            };
+      };
+      homeConfigurations = {
+        # X1 Carbon
+        "ooks@ooksx1" = lib.homeManagerConfiguration {
+          inherit system;
+          modules = [ ./home/ooks/ooksx1.nix ];
+          pkgs = pkgsFor.x86_64-linux;
+          extraSpecialArgs = { inherit inputs outputs; };
         };
+      };    
     };
 }