From 2497d0c7566a80addd63e80c4a3170bc298eec1f Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <eu@misterio.me>
Date: Mon, 1 Aug 2022 21:52:47 -0300
Subject: [PATCH] cleanup flake a bit

---
 flake.lock | 18 ++++++++---------
 flake.nix  | 59 +++++++++++++++++++++---------------------------------
 2 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8963660..9a5b1e3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "hardware": {
       "locked": {
-        "lastModified": 1656933710,
-        "narHash": "sha256-SVG8EqY1OTJWBRY4hpct2ZR2Rk0L8hCFkug3m0ABoZE=",
+        "lastModified": 1659356074,
+        "narHash": "sha256-UwV6hZZEtchvtiTCCD/ODEv1226eam8kEgEyQb7xB0E=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "3bf48d3587d3f34f745a19ebc968b002ef5b5c5a",
+        "rev": "ea3efc80f8ab83cb73aec39f4e76fe87afb15a08",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1657241847,
-        "narHash": "sha256-/aN3p2LaRNVXf7w92GWgXq9H5f23YRQPOvsm3BrBqzU=",
+        "lastModified": 1659371922,
+        "narHash": "sha256-lzHe7LN7reblaonfkemzfmB0aRZDt7QJ/Vbp7iyghnU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8160b3b45b8457d58d2b3af2aeb2eb6f47042e0f",
+        "rev": "d1c677ac257affed8d026f418b81ed5de2c8d963",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1657114324,
-        "narHash": "sha256-fWuaUNXrHcz/ciHRHlcSO92dvV3EVS0GJQUSBO5JIB4=",
+        "lastModified": 1659219666,
+        "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a5c867d9fe9e4380452628e8f171c26b69fa9d3d",
+        "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 06f8451..509972b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,45 +9,32 @@
     # Home manager
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
+    # TODO: Add any other flake you might need
   };
 
-  outputs = { nixpkgs, home-manager, ... }@inputs:
-    let
-      # Bring some functions into scope (from builtins and other flakes)
-      inherit (nixpkgs.lib) nixosSystem;
-      inherit (home-manager.lib) homeManagerConfiguration;
-      # We'll use x86_64-linux for everything, but you can have hosts/homes for
-      # different systems and architectures if you want
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      # System configurations
-      # Accessible via 'nixos-rebuild'
-      nixosConfigurations = {
-        # FIXME: Replace with your hostname
-        your-hostname = nixosSystem {
-          inherit system;
-          pkgs = nixpkgs.legacyPackages.${system};
+  outputs = { nixpkgs, home-manager, ... }@inputs: {
+    nixosConfigurations = {
+      # FIXME replace with your hostname
+      your-hostname = nixpkgs.lib.nixosSystem {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        system = "x86_64-linux";
 
-          # >> Main NixOS configuration file <<
-          modules = [ ./nixos/configuration.nix ];
-          # Make our inputs available to the config (for importing modules)
-          specialArgs = { inherit inputs; };
-        };
-      };
-
-      # Home configurations
-      # Accessible via 'home-manager'
-      homeConfigurations = {
-        # FIXME: Replace with your username@hostname
-        "your-name@your-hostname" = homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.${system};
-
-          # >> Main home-manager configuration file <<
-          modules = [ ./home-manager/home.nix ];
-          # Make our inputs available to the config (for importing modules)
-          extraSpecialArgs = { inherit inputs; };
-        };
+        modules = [ ./nixos/configuration.nix ];
+        # Pass inputs down to our config, so that they can consume flake inputs
+        specialArgs = { inherit inputs; };
       };
     };
+
+    homeConfigurations = {
+      # FIXME replace with your username@hostname
+      "your-name@your-hostname" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+
+        modules = [ ./home-manager/home.nix ];
+        # Pass inputs down to our config, so that they can consume flake inputs
+        extraSpecialArgs = { inherit inputs; };
+      };
+    };
+  };
 }