From bac1813c7765fa7edad771fbc9c660fffb8faa33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Tue, 16 Jan 2024 23:48:41 +0100
Subject: [PATCH] nod: Fifth attempt at flakes

Also simplified a few things, nice
---
 flake.nix              | 22 +++++++++++++---------
 hm/nix/default.nix     |  1 -
 nod/common/default.nix |  1 -
 os/common.nix          |  1 -
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 70b64f7..6d536d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,35 +38,38 @@
 
   outputs = { self, nixpkgs, disko, nixos-hardware, nix-on-droid, home-manager, stylix, nixvim, nixgl, nur, ... }:
     let
-      sharedOverlays = [
-        nixgl.overlay
-      ];
+      nixpkgsConfig = {
+        overlays = [
+          nixgl.overlay
+        ];
+        config.allowUnfree = true;
+      };
       lib = {
         nixosSystem = { system, modules ? [ ] }: nixpkgs.lib.nixosSystem {
           inherit system;
           modules = modules ++ [
             self.nixosModules.dotfiles
             {
-              nixpkgs.overlays = sharedOverlays;
+              nixpkgs = nixpkgsConfig;
               home-manager.sharedModules = [ self.homeManagerModules.dotfiles ];
             }
           ];
         };
         nixOnDroidConfiguration = { modules ? [ ] }: nix-on-droid.lib.nixOnDroidConfiguration {
+          pkgs = import nixpkgs (nixpkgsConfig // {
+            system = "aarch64-linux"; # nod doesn't support anything else
+          });
           modules = modules ++ [
             self.nixOnDroidModules.dotfiles
             {
-              # TODO Can't use overlays, see
-              # https://github.com/nix-community/nix-on-droid/blob/039379abeee67144d4094d80bbdaf183fb2eabe5/modules/nixpkgs/options.nix#L166
               home-manager.sharedModules = [ self.homeManagerModules.dotfiles ];
             }
           ];
         };
         homeManagerConfiguration = { system, modules ? [ ] }: home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs {
+          pkgs = import nixpkgs (nixpkgsConfig // {
             inherit system;
-            overlays = sharedOverlays;
-          };
+          });
           modules = modules ++ [ self.homeManagerModules.dotfiles ];
         };
       };
@@ -83,6 +86,7 @@
       nixOnDroidModules.dotfiles = {
         imports = [
           ./nod
+          # home-manager is included
         ];
       };
       homeManagerModules.dotfiles = {
diff --git a/hm/nix/default.nix b/hm/nix/default.nix
index e0f8929..deb58ac 100644
--- a/hm/nix/default.nix
+++ b/hm/nix/default.nix
@@ -19,6 +19,5 @@
         warn-dirty = false;
       };
     };
-    nixpkgs.config.allowUnfree = true;
   };
 }
diff --git a/nod/common/default.nix b/nod/common/default.nix
index 8153cd5..8583574 100644
--- a/nod/common/default.nix
+++ b/nod/common/default.nix
@@ -13,7 +13,6 @@
       };
     };
   };
-  nixpkgs.config.allowUnfree = true;
   system.stateVersion = "23.11";
   terminal.font = "${
     pkgs.nerdfonts.override {
diff --git a/os/common.nix b/os/common.nix
index 9a292b3..7bd95ff 100644
--- a/os/common.nix
+++ b/os/common.nix
@@ -28,7 +28,6 @@
     git # Needed for all the fetchFromGit in this repo on nixos-rebuild
   ];
 
-  nixpkgs.config.allowUnfree = true;
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
     warn-dirty = false;