From 12d963a99e740c8d4345da32b3000d85569af9d5 Mon Sep 17 00:00:00 2001
From: Emmet <librephoenix3@pm.me>
Date: Sun, 7 May 2023 09:40:37 -0500
Subject: [PATCH] Committing flakes again..

---
 flake.lock | 35 +++++++++++------------------------
 flake.nix  | 17 ++++++++++++++---
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0a155d4d..3b501032 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,7 +39,9 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1683459775,
@@ -79,36 +81,21 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1683286087,
-        "narHash": "sha256-xseOd7W7xwF5GOF2RW8qhjmVGrKoBz+caBlreaNzoeI=",
-        "owner": "nixos",
+        "lastModified": 1683469126,
+        "narHash": "sha256-XdXhPfHhASSXK2eTw6bt/q7dSdIc9EEKVFFSwKIRdoQ=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf",
+        "rev": "10b7975794c5cb008e7b83c580d9ea9ab231e4bb",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "owner": "NixOS",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1683466960,
-        "narHash": "sha256-cDTGzQ3z1rqEjc/3Z/+DB3r8IYtM8HXuBO6ofeynH1w=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9757bdca3bfc13fd21d9e9d28517793bfc5143a8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1679793451,
         "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=",
@@ -127,7 +114,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "stylix": "stylix"
       }
     },
@@ -136,7 +123,7 @@
         "base16": "base16",
         "flake-compat": "flake-compat",
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1683100629,
diff --git a/flake.nix b/flake.nix
index 9e337e4a..d8f31de8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,18 +2,29 @@
   description = "Snowflakes are fractals";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
     home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     stylix.url = "github:danth/stylix";
   };
 
-  outputs = { self, nixpkgs, home-manager, stylix }: {
-    nixosConfigurations.snowfire = nixpkgs.lib.nixosSystem {
+  outputs = { self, nixpkgs, home-manager, stylix }:
+    let
       system = "x86_64-linux";
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
+      lib = nixpkgs.lib;
+    in
+    {
+    nixosConfigurations.snowfire = nixpkgs.lib.nixosSystem {
+      inherit system;
       modules = [ ./system/configuration.nix ];
     };
 
     homeConfigurations."emmet" = home-manager.lib.homeManagerConfiguration {
+      pkgs = nixpkgs.packages.x86_64-linux.default;
       modules = [ stylix.homeManagerModules.stylix ./user/home.nix ];
     };