From 9bb834587d97c1ed57da8b7b36f69731b177af8b Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Wed, 25 Aug 2021 21:39:05 +0200
Subject: [PATCH 1/2] flake: pin nixpkgs channel in nix path

---
 flake.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/flake.nix b/flake.nix
index faa4564..3484c28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,6 +53,11 @@
         home-manager.users.alarsyo = import ./home;
         home-manager.verbose = true;
       };
+      nix-path = {
+        nix.nixPath = [
+          "nixpkgs=${inputs.nixpkgs}"
+        ];
+      };
     };
 
     nixosConfigurations =
@@ -76,6 +81,8 @@
           modules = [
             ./poseidon.nix
 
+            self.nixosModules.nix-path
+
             home-manager.nixosModule
             self.nixosModules.home
 
@@ -103,6 +110,8 @@
           modules = [
             ./boreal.nix
 
+            self.nixosModules.nix-path
+
             home-manager.nixosModule
             self.nixosModules.home
 
@@ -130,6 +139,8 @@
             inputs.nixos-hardware.nixosModules.common-pc-laptop
             inputs.nixos-hardware.nixosModules.common-pc-ssd
 
+            self.nixosModules.nix-path
+
             home-manager.nixosModule
             self.nixosModules.home
 

From e4775f4611ce51e286ad7b7ee8187c422d62ce55 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Wed, 25 Aug 2021 21:56:42 +0200
Subject: [PATCH 2/2] flake: factorize shared modules

---
 flake.nix | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3484c28..8719c74 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,6 +74,10 @@
             };
           })
         ];
+        sharedModules = [
+          home-manager.nixosModule
+          { nixpkgs.overlays = shared_overlays; }
+        ] ++ (nixpkgs.lib.attrValues self.nixosModules);
       in {
 
         poseidon = nixpkgs.lib.nixosSystem rec {
@@ -81,11 +85,6 @@
           modules = [
             ./poseidon.nix
 
-            self.nixosModules.nix-path
-
-            home-manager.nixosModule
-            self.nixosModules.home
-
             {
               nixpkgs.overlays = [
                 (self: super: {
@@ -100,9 +99,9 @@
                     python3 = self.fastPython3;
                   };
                 })
-              ] ++ shared_overlays;
+              ];
             }
-          ];
+          ] ++ sharedModules;
         };
 
         boreal = nixpkgs.lib.nixosSystem rec {
@@ -110,11 +109,6 @@
           modules = [
             ./boreal.nix
 
-            self.nixosModules.nix-path
-
-            home-manager.nixosModule
-            self.nixosModules.home
-
             {
               nixpkgs.overlays = [
                 inputs.emacs-overlay.overlay
@@ -125,9 +119,9 @@
                 # (self: super: {
                 #   stdenv = super.impureUseNativeOptimizations super.stdenv;
                 # })
-              ] ++ shared_overlays;
+              ];
             }
-          ];
+          ] ++ sharedModules;
         };
 
         zephyrus = nixpkgs.lib.nixosSystem rec {
@@ -139,17 +133,12 @@
             inputs.nixos-hardware.nixosModules.common-pc-laptop
             inputs.nixos-hardware.nixosModules.common-pc-ssd
 
-            self.nixosModules.nix-path
-
-            home-manager.nixosModule
-            self.nixosModules.home
-
             {
               nixpkgs.overlays = [
                 inputs.emacs-overlay.overlay
-              ] ++ shared_overlays;
+              ];
             }
-          ];
+          ] ++ sharedModules;
         };
 
       };