From 799eab00e24c2f8643567826fc3371e190ba23e4 Mon Sep 17 00:00:00 2001
From: Adithya Nair <adtya@adtya.xyz>
Date: Sun, 28 May 2023 22:54:11 +0530
Subject: [PATCH] refactor nix stuff

---
 common/nix.nix |  1 -
 flake.nix      | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/common/nix.nix b/common/nix.nix
index 9545cb8..046ba2b 100644
--- a/common/nix.nix
+++ b/common/nix.nix
@@ -16,5 +16,4 @@
       use-cgroups = true;
     };
   };
-  nixpkgs.config.allowUnfree = true;
 }
diff --git a/flake.nix b/flake.nix
index e2eae1c..42ad349 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,13 +39,16 @@
     nixosConfigurations = let
       user = (import ./secrets.nix).users;
     in {
-      Skipper = nixpkgs.lib.nixosSystem {
+      Skipper = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
+        pkgs = import nixpkgs {
+          inherit system;
+          config = {allowUnfree = true;};
+          overlays = [(import ./packages) nixneovim.overlays.default];
+        };
         specialArgs = inputs;
         modules = [
           {
-            nixpkgs.overlays = [(import ./packages) nixneovim.overlays.default];
-            nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "x86_64-linux";
             system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
           }
 
@@ -71,12 +74,15 @@
           }
         ];
       };
-      Rico2 = nixpkgs.lib.nixosSystem {
+      Rico2 = nixpkgs.lib.nixosSystem rec {
         system = "aarch64-linux";
+        pkgs = import nixpkgs {
+          inherit system;
+          config = {allowUnfree = true;};
+        };
         specialArgs = inputs;
         modules = [
           {
-            nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "aarch64-linux";
             system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
           }
           ./common