From 49df2ca301104b3a4aa91fb6d2517f491e486d33 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 1 Jan 2025 12:17:39 +0100
Subject: [PATCH] chore: Update to unstable and pass stable packages down to
 home-manager

---
 flake.lock                                | 27 ++++++++++++++++++-----
 flake.nix                                 |  5 ++++-
 home/alex/home.nix                        |  4 ++--
 home/alex/programs/jitsi-meet/default.nix | 10 +++++++--
 hosts/dregil/configuration.nix            | 18 ++++++++-------
 hosts/dregil/default.nix                  |  2 ++
 6 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8564c89..e4ca149 100644
--- a/flake.lock
+++ b/flake.lock
@@ -268,16 +268,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735531152,
-        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -457,7 +457,8 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-droid": "nixpkgs-droid",
         "pre-commit-hooks": "pre-commit-hooks",
-        "snm": "snm"
+        "snm": "snm",
+        "stable": "stable"
       }
     },
     "snm": {
@@ -482,6 +483,22 @@
         "type": "gitlab"
       }
     },
+    "stable": {
+      "locked": {
+        "lastModified": 1735531152,
+        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 594588e..2c96d27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,7 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    stable.url = "github:NixOS/nixpkgs/nixos-24.11";
     nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-23.05";
 
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
@@ -47,6 +48,7 @@
       self,
       home-manager,
       nixpkgs,
+      stable,
       pre-commit-hooks,
       ...
     }@inputs:
@@ -102,6 +104,7 @@
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
+          stable = import inputs.stable { system = "x86_64-linux"; };
         };
         modules = [ ./hosts/dregil ];
       };
diff --git a/home/alex/home.nix b/home/alex/home.nix
index 6d2e9c2..46c4160 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  stable,
   ...
 }:
 {
@@ -41,7 +42,6 @@
 
     packages = with pkgs; [
       # social
-      jitsi-meet-electron
       discord # talk to other people
       google-chrome
 
@@ -52,7 +52,7 @@
 
       # gaming support
       lutris
-      bottles
+      stable.bottles
       wine64Packages.stagingFull
       scummvm
 
diff --git a/home/alex/programs/jitsi-meet/default.nix b/home/alex/programs/jitsi-meet/default.nix
index 1037a92..47927d7 100644
--- a/home/alex/programs/jitsi-meet/default.nix
+++ b/home/alex/programs/jitsi-meet/default.nix
@@ -1,5 +1,11 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  stable,
+  ...
+}:
 
 {
-  config.home.packages = [ pkgs.jitsi-meet-electron ];
+  config.home.packages = [ stable.jitsi-meet-electron ];
 }
diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix
index 7d6bc7f..f89f65e 100644
--- a/hosts/dregil/configuration.nix
+++ b/hosts/dregil/configuration.nix
@@ -64,14 +64,16 @@ in
 
   fonts = {
     enableDefaultPackages = true;
-    packages = with pkgs; [
-      corefonts
-      noto-fonts
-      noto-fonts-emoji
-      fira-code
-      fira-code-symbols
-      nerdfonts
-    ];
+    packages =
+      with pkgs;
+      [
+        corefonts
+        noto-fonts
+        noto-fonts-emoji
+        fira-code
+        fira-code-symbols
+      ]
+      ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
   };
 
   # Enable CUPS to print documents.
diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix
index c4852b4..40e0959 100644
--- a/hosts/dregil/default.nix
+++ b/hosts/dregil/default.nix
@@ -3,6 +3,7 @@
   config,
   pkgs,
   inputs,
+  stable,
   ...
 }:
 {
@@ -13,6 +14,7 @@
         nixpkgs = {
           config.allowUnfree = true;
         };
+        home-manager.extraSpecialArgs = { inherit stable; };
       }
     )
     ../../modules/security.nix