From 36b8bcf18b6f4664c937f6274308ac7c93c10209 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Sun, 20 Oct 2024 13:36:34 -0400
Subject: [PATCH] making it easier to install stable packages as needed

---
 flake.lock    | 22 +++++++++++-----------
 flake.nix     |  5 ++++-
 home/home.nix | 11 +++++------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4cd3629..5de9842 100644
--- a/flake.lock
+++ b/flake.lock
@@ -106,11 +106,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1728821524,
-        "narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=",
+        "lastModified": 1729426412,
+        "narHash": "sha256-VGbpECf35W4LtWLfx2+ue8zZEPwKQnadJadlT8E1Ceo=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "8921856c37862428741a29cfd4c98c4893ca407d",
+        "rev": "736c43de3c953104e1610183d56e90b419c6344e",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1729333370,
-        "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=",
+        "lastModified": 1729417461,
+        "narHash": "sha256-p0j/sUs7noqZw0W+SEuZXskzOfgOH7yY80ksIM0fCi4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb",
+        "rev": "8f38d8a4754cf673c2609c4ed399630db87e678b",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1728781282,
+        "lastModified": 1729386149,
         "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
+        "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
         "type": "github"
       },
       "original": {
@@ -270,11 +270,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729330084,
-        "narHash": "sha256-3lGZyrHLmCSXcFEv1th04j/+2CUMzNDvQdbqXHMBqfM=",
+        "lastModified": 1729437727,
+        "narHash": "sha256-T7R1ZmK8H8LH4losXinI/CvX2mvrt9bGDDdoUdUzp6g=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "349ce1dcf7ce051dccb7432f950203117f5995f4",
+        "rev": "d867d1b9f8adc3178db34ae309cf7c6e840991b2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5e8c8e1..c32864e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,7 +58,10 @@
 
       "emenel" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        extraSpecialArgs = { inherit inputs; };
+        extraSpecialArgs = {
+          inherit inputs;
+          pkgs-stable = nixpkgs-stable.legacyPackages.x86_64-linux;
+        };
 
         modules = [
           nix-flatpak.homeManagerModules.nix-flatpak
diff --git a/home/home.nix b/home/home.nix
index f9a9ce2..cdd5b92 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,4 +1,4 @@
-{ nix-flatpak, lib, pkgs, inputs, ... }:
+{ nix-flatpak, lib, pkgs, inputs, pkgs-stable, ... }:
 {
 
   nixpkgs.config.allowUnfree = true;
@@ -58,15 +58,15 @@
       aspellDicts.en-computers
       texlive.combined.scheme-full
       appimage-run
-      #transmission_4
       transmission_4-gtk
       lsof
       ruby
       janet
       jpm
       python311
-      ruff
       python311Packages.pip
+      python312Packages.mido
+      ruff
       sbcl
       sbclPackages.cffi
       libffi.dev
@@ -85,7 +85,6 @@
       # node packages
       nodePackages.typescript-language-server
       nodePackages.vscode-langservers-extracted
-
       nodePackages.prettier
       nodePackages.javascript-typescript-langserver
       nodePackages.stylelint
@@ -180,7 +179,7 @@
       inkscape
       gimp
       epson-escpr
-      inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.kicad #install stable kicad because unstable breaks on python12 dependency
+      pkgs-stable.kicad #install stable kicad because unstable breaks on python12 dependency
       openscad-unstable
       openscad-lsp
       picard
@@ -202,7 +201,7 @@
       lsp-plugins
       geonkick
       bespokesynth
-      # helm
+      pkgs-stable.helm
       surge
       odin2
       calf