From 01d7438797c1062489cb97d46fd7efd875ca05ac Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Sat, 5 Mar 2022 18:52:59 +0100
Subject: [PATCH] stable packages separate

---
 capibara.nix | 11 +++++++----
 flake.nix    | 52 +++++++++++++++++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/capibara.nix b/capibara.nix
index 80f8676..7ee0623 100644
--- a/capibara.nix
+++ b/capibara.nix
@@ -2,13 +2,16 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, inputs, pkgs, ... }:
+{ config, pkgs, stablePkgs, impermanence, ... }:
 
 {
   imports = [ ./nixos/hardware-configuration/capibara.nix ./nixos/common.nix ];
 
-  home-manager.users.rilla.imports =
-    [ home/capibara.nix "${inputs.impermanence}/home-manager.nix" ];
+  home-manager = {
+    users.rilla.imports =
+      [ home/capibara.nix "${impermanence}/home-manager.nix" ];
+    extraSpecialArgs.stablePkgs = stablePkgs;
+  };
 
   #fileSystems = {
   #  "/home/rilla/Music" = {
@@ -68,7 +71,7 @@
   # Power management
   powerManagement.enable = true;
   services.upower.enable = true;
-  services.thermald.enable = true;
+  # services.thermald.enable = true;
   services.tlp.enable = true;
   services.power-profiles-daemon.enable = false;
   environment.systemPackages = with pkgs; [ powertop acpi ];
diff --git a/flake.nix b/flake.nix
index 0c58462..440590c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,35 +1,45 @@
 {
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "nixpkgs/nixos-21.11";
+
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     impermanence.url = "github:nix-community/impermanence";
   };
-  outputs = { self, nixpkgs, home-manager, impermanence }@inputs: {
-    nixosConfigurations = {
-      trantor = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs.inputs = inputs;
+  outputs =
+    { self, nixpkgs, nixpkgs-stable, home-manager, impermanence }@inputs: {
+      nixosConfigurations = {
+        trantor = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = {
+            # unstablePkgs = nixpkgs-unstable.legacyPackages."x86_64-linux";
+            impermanence = impermanence;
+          };
 
-        modules = [
-          ./trantor.nix
-          home-manager.nixosModules.home-manager
-          impermanence.nixosModules.impermanence
-        ];
-      };
+          modules = [
+            ./trantor.nix
+            home-manager.nixosModules.home-manager
+            impermanence.nixosModules.impermanence
+          ];
+        };
 
-      capibara = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs.inputs = inputs;
+        capibara = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = {
+            # unstablePkgs = nixpkgs-unstable.legacyPackages."x86_64-linux";
+            stablePkgs = nixpkgs-stable.legacyPackages."x86_64-linux";
+            impermanence = impermanence;
+          };
 
-        modules = [
-          ./capibara.nix
-          home-manager.nixosModules.home-manager
-          impermanence.nixosModules.impermanence
-        ];
+          modules = [
+            ./capibara.nix
+            home-manager.nixosModules.home-manager
+            impermanence.nixosModules.impermanence
+          ];
+        };
       };
     };
-  };
 }