instantiate pkgs only once (#239)

gvolpe · Sep 16, 2023 · 3fbc4ae · 3fbc4ae
1 parent d841b95
commit 3fbc4ae
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 94 deletions.
diff --git a/flake.nix b/flake.nix
@@ -19,7 +19,7 @@
     };
 
     #sxm-flake = {
-      #url = git+file:///home/gvolpe/workspace/sxm/sxm-flake;
+    #url = git+file:///home/gvolpe/workspace/sxm/sxm-flake;
     #};
 
     neovim-flake = {
@@ -65,14 +65,21 @@
   outputs = inputs:
     let
       system = "x86_64-linux";
-      ci = import ./outputs/ci.nix { inherit inputs system; };
+
+      pkgs = import inputs.nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+        overlays = import ./lib/overlays.nix { inherit inputs system; };
+      };
+
+      ci = import ./outputs/ci.nix { inherit pkgs; };
     in
     {
       homeConfigurations =
-        import ./outputs/home-conf.nix { inherit inputs system; };
+        import ./outputs/home-conf.nix { inherit inputs system pkgs; };
 
       nixosConfigurations =
-        import ./outputs/nixos-conf.nix { inherit inputs system; };
+        import ./outputs/nixos-conf.nix { inherit inputs system pkgs; };
 
       packages.${system} = {
         inherit (ci) metals metals-updater;

diff --git a/lib/overlays.nix b/lib/overlays.nix
@@ -0,0 +1,42 @@
+{ inputs, system }:
+
+with inputs;
+
+let
+  cowsayOverlay = f: p: {
+    inherit (inputs.cowsay.packages.${system}) cowsay;
+  };
+
+  fishOverlay = f: p: {
+    inherit fish-bobthefish-theme fish-keytool-completions;
+  };
+
+  nautilusOverlay = f: p: {
+    nautilus-gtk3 = nixpkgs-nautilus-gtk3.legacyPackages.${system}.gnome.nautilus;
+  };
+
+  libOverlay = f: p: rec {
+    libx = import ./. { inherit (p) lib; };
+    lib = p.lib.extend (_: _: {
+      inherit (libx) removeNewline secretManager;
+    });
+  };
+
+  sxmOverlay =
+    if (builtins.hasAttr "sxm-flake" inputs)
+    then sxm-flake.overlays.default
+    else (f: p: { });
+in
+[
+  cowsayOverlay
+  fishOverlay
+  libOverlay
+  nautilusOverlay
+  nurpkgs.overlay
+  neovim-flake.overlays.${system}.default
+  statix.overlays.default
+  sxmOverlay
+  (import ../home/overlays/bat-lvl)
+  (import ../home/overlays/nautilus)
+  (import ../home/overlays/ranger)
+]
diff --git a/outputs/ci.nix b/outputs/ci.nix
@@ -1,18 +1,5 @@
-{ inputs, system, ... }:
+{ pkgs, ... }:
 
-with inputs;
-
-let
-  pkgs = import nixpkgs {
-    inherit system;
-
-    config.allowUnfree = true;
-
-    overlays = [
-      neovim-flake.overlays.${system}.default
-    ];
-  };
-in
 {
   metals = pkgs.callPackage ../home/programs/neovim-ide/metals.nix { };
   metals-updater = pkgs.callPackage ../home/programs/neovim-ide/update-metals.nix { };

diff --git a/outputs/home-conf.nix b/outputs/home-conf.nix
@@ -1,57 +1,8 @@
-{ inputs, system, ... }:
+{ inputs, system, pkgs, ... }:
 
 with inputs;
 
 let
-  cowsayOverlay = f: p: {
-    inherit (inputs.cowsay.packages.${system}) cowsay;
-  };
-
-  fishOverlay = f: p: {
-    inherit fish-bobthefish-theme fish-keytool-completions;
-  };
-
-  nautilusOverlay = f: p: {
-    nautilus-gtk3 = nixpkgs-nautilus-gtk3.legacyPackages.${system}.gnome.nautilus;
-  };
-
-  libOverlay = f: p: rec {
-    libx = import ../lib { inherit (p) lib; };
-    lib = p.lib.extend (_: _: {
-      inherit (libx) removeNewline secretManager;
-    });
-  };
-
-  sxmOverlay =
-    if (builtins.hasAttr "sxm-flake" inputs)
-    then sxm-flake.overlays.default
-    else (f: p: { });
-
-  pkgs = import nixpkgs {
-    inherit system;
-
-    config.allowUnfree = true;
-
-    overlays = [
-      cowsayOverlay
-      fishOverlay
-      libOverlay
-      nautilusOverlay
-      nurpkgs.overlay
-      neovim-flake.overlays.${system}.default
-      statix.overlays.default
-      sxmOverlay
-      (import ../home/overlays/bat-lvl)
-      (import ../home/overlays/nautilus)
-      (import ../home/overlays/ranger)
-    ];
-  };
-
-  nur = import nurpkgs {
-    inherit pkgs;
-    nurpkgs = pkgs;
-  };
-
   imports = [
     neovim-flake.nixosModules.${system}.hm
     ../home/home.nix
@@ -62,10 +13,9 @@ let
       inherit pkgs;
 
       extraSpecialArgs = {
-        inherit hidpi;
-        inherit (inputs) gh-md-toc;
+        inherit gh-md-toc hidpi;
         inherit (rycee-nurpkgs.lib.${system}) buildFirefoxXpiAddon;
-        addons = nur.repos.rycee.firefox-addons;
+        addons = pkgs.nur.repos.rycee.firefox-addons;
       };
 
       modules = [{ inherit imports; }];

diff --git a/outputs/nixos-conf.nix b/outputs/nixos-conf.nix
@@ -1,29 +1,7 @@
-{ inputs, system, ... }:
+{ inputs, system, pkgs, lib ? pkgs.lib, ... }:
 
 let
   inherit (inputs.nixpkgs.lib) nixosSystem;
-
-  libx = import ../lib { inherit (inputs.nixpkgs) lib; };
-
-  lib = inputs.nixpkgs.lib.extend (_: _: {
-    inherit (libx) secretManager;
-  });
-
-  sxmOverlay =
-    if (builtins.hasAttr "sxm-flake" inputs)
-    then inputs.sxm-flake.overlays.default
-    else (f: p: { });
-
-  pkgs = import inputs.nixpkgs {
-    inherit system;
-    config = {
-      allowUnfree = true;
-      permittedInsecurePackages = [
-        "xrdp-0.9.9"
-      ];
-    };
-    overlays = [ sxmOverlay ];
-  };
 in
 {
   dell-xps = nixosSystem {