From 921aabab40fd40fd77373c1a3eb753d1b1ee40c5 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Wed, 18 Jun 2025 11:20:48 -0400
Subject: [PATCH] added pkgs-local for easy access

---
 flake.lock                    | 18 +++++++++---------
 flake.nix                     |  1 +
 hosts/eddie/configuration.nix |  6 +++---
 modules/home/desktop.nix      |  4 ++--
 modules/home/email.nix        |  6 +++---
 modules/home/mpd.nix          |  4 ++--
 modules/home/music.nix        |  4 ++--
 modules/home/shell-conf.nix   |  4 ++--
 8 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index e54bca4..e6ee75c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -448,11 +448,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750127463,
-        "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=",
+        "lastModified": 1750256996,
+        "narHash": "sha256-xPH4tgE7yIeBtOn54B6iDzMGXrf7mWvODML+DCN+H8I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402",
+        "rev": "f754e377dc2da5d34dfea6a5215c21741eaf8930",
         "type": "github"
       },
       "original": {
@@ -1021,11 +1021,11 @@
         "website-builder": "website-builder"
       },
       "locked": {
-        "lastModified": 1750157900,
-        "narHash": "sha256-u7BQLF2u3OESnAQdkT+AMijeYzx06jx0ejKy2e0J+6g=",
+        "lastModified": 1750256441,
+        "narHash": "sha256-StjDYOcjdPXJGdbj+f2UammkrfX8dEc8bO1im/TRVvo=",
         "owner": "rasmus-kirk",
         "repo": "nixarr",
-        "rev": "b19ddfaced3849567ce8ac0cbf3ca34ec9adfa91",
+        "rev": "28d1be070deb1a064c1967889c11c8921752fa09",
         "type": "github"
       },
       "original": {
@@ -1776,11 +1776,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1750246231,
-        "narHash": "sha256-BaWLTwrVXbHMliR5Ko2d36XMM4r5vZ6nz/jFB0QjliU=",
+        "lastModified": 1750255296,
+        "narHash": "sha256-ejuEJxTMS6Sd5IUoa8iF4YJkOvAy3Yf7jWEgcjTwwyM=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "750ca0c0d40af099a46d340df47af87eec267d4a",
+        "rev": "1a6abae974370702c8865459344bf256de58359e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ad2c36a..6e5e611 100644
--- a/flake.nix
+++ b/flake.nix
@@ -136,6 +136,7 @@
       configArgs = {
         inherit inputs;
         nix-config = self;
+        pkgs-local = self.packages.x86_64-linux;
         pkgs-stable = import inputs.nixpkgs-stable {
           inherit system;
           config.allowUnfree = true;
diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 404a5e2..4774831 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -1,4 +1,4 @@
-{ nix-config, config, pkgs, pkgs-stable, inputs, ... }:
+{ nix-config, config, pkgs, pkgs-local, pkgs-stable, inputs, ... }:
 
 {
 
@@ -69,8 +69,8 @@
 
       # adds newer bitwig version package. i'm sure this is a hack, but it works.
       (final: prev: {
-        bitwig-studio5-3 = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-bubblewrap.override {
-          bitwig-studio = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-studio5-3-unwrapped;
+        bitwig-studio5-3 = pkgs-local.bitwig-studio.bitwig-bubblewrap.override {
+          bitwig-studio = pkgs-local.bitwig-studio.bitwig-studio5-3-unwrapped;
         };
       })
     ];
diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix
index 4746f43..daffd66 100644
--- a/modules/home/desktop.nix
+++ b/modules/home/desktop.nix
@@ -1,4 +1,4 @@
-{ pkgs, nix-config, inputs, lib, ... }:
+{ pkgs, nix-config, pkgs-local, lib, ... }:
 
 {
 
@@ -92,7 +92,7 @@
     davinci-resolve-studio
     processing
     zotero
-    # nix-config.packages.x86_64-linux.zotero-latest
+    # pkgs-local.zotero-latest
     fractal
     handbrake
     gmic
diff --git a/modules/home/email.nix b/modules/home/email.nix
index 99afacc..35b39be 100644
--- a/modules/home/email.nix
+++ b/modules/home/email.nix
@@ -1,6 +1,6 @@
-{ nix-config, pkgs, ... }:
+{ pkgs-local, pkgs, ... }:
 let
-  pwdcmd = "${nix-config.packages.x86_64-linux.rbw-latest}/bin/rbw";
+  pwdcmd = "${pkgs-local.rbw-latest}/bin/rbw";
 in
 {
   accounts.email = {
@@ -54,7 +54,7 @@ in
   services.imapnotify = {
     enable = true;
     package = pkgs.goimapnotify;
-    path = [ pkgs.mu pkgs.isync pkgs.goimapnotify nix-config.packages.x86_64-linux.rbw-latest ];
+    path = [ pkgs.mu pkgs.isync pkgs.goimapnotify pkgs-local.rbw-latest ];
   };
 
   programs = {
diff --git a/modules/home/mpd.nix b/modules/home/mpd.nix
index e1a60df..14ac79a 100644
--- a/modules/home/mpd.nix
+++ b/modules/home/mpd.nix
@@ -1,9 +1,9 @@
-{ nix-config, pkgs, ... }:
+{ pkgs-local, pkgs, ... }:
 
 {
   home.packages = with pkgs; [
     mpc
-    nix-config.packages.x86_64-linux.rmpc-latest
+    pkgs-local.rmpc-latest
   ];
 
   services = {
diff --git a/modules/home/music.nix b/modules/home/music.nix
index 2759dde..ed29c4b 100644
--- a/modules/home/music.nix
+++ b/modules/home/music.nix
@@ -1,7 +1,7 @@
-{ nix-config, lib, pkgs, ... }:
+{ pkgs-local, lib, pkgs, ... }:
 {
   home.packages = lib.mkMerge [
-    (with nix-config.packages.x86_64-linux; [
+    (with pkgs-local; [
       mioctl
       tal.bassline
       tal.j8
diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix
index 0165856..c9f094f 100644
--- a/modules/home/shell-conf.nix
+++ b/modules/home/shell-conf.nix
@@ -1,4 +1,4 @@
-{ nix-config, pkgs-stable, inputs, pkgs, ... }:
+{ pkgs-local, pkgs-stable, inputs, pkgs, ... }:
 {
 
   home.packages = with pkgs; [
@@ -192,7 +192,7 @@
     jq.enable = true;
     rbw = {
       enable = true;
-      package = nix-config.packages.x86_64-linux.rbw-latest;
+      package = pkgs-local.rbw-latest;
     };
   };