refactor

common/nix.nix

@@ -1,19 +1,24 @@
-{nixpkgs, ...}: {
+{
+  nixpkgs,
+  pkgs,
+  ...
+}: {
   environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
   nix = {
+    package = pkgs.nixFlakes;
     nixPath = ["nixpkgs=/etc/nix/inputs/nixpkgs"];
     registry.nixpkgs.flake = nixpkgs;
     settings = {
+      auto-optimise-store = true;
+      experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "cgroups" "ca-derivations"];
+      auto-allocate-uids = true;
+      use-cgroups = true;
       trusted-substituters = [
         "https://nix-community.cachix.org/"
       ];
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
-      auto-optimise-store = true;
-      experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "cgroups" "ca-derivations"];
-      auto-allocate-uids = true;
-      use-cgroups = true;
     };
   };
 }

flake.nix

@@ -40,6 +40,9 @@
     nixvim,
   } @ inputs: let
     secrets = import ./secrets.nix;
+    config = {
+      allowUnfree = true;
+    };
   in
     {
       nixosConfigurations = {
@@ -47,9 +50,7 @@
           system = "x86_64-linux";
           pkgs = import nixpkgs {
             inherit system;
-            config = {
+            inherit config;
-              allowUnfree = true;
-            };
             overlays = [(import ./packages)];
           };
           specialArgs = inputs // {inherit secrets;};
@@ -85,9 +86,7 @@
           system = "aarch64-linux";
           pkgs = import nixpkgs {
             inherit system;
-            config = {
+            inherit config;
-              allowUnfree = true;
-            };
           };
           specialArgs = inputs // {inherit secrets;};
           modules = [