From 76dd1bafeb2260250e99d64bdf04cccbcda3959e Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@wyattjmiller.com>
Date: Sun, 9 Feb 2025 15:36:24 -0500
Subject: [PATCH] use nixpkgs nix-ld

---
 flake.lock                                | 55 +++++------------------
 flake.nix                                 |  4 --
 modules/machine/cloud/configuration.nix   |  1 +
 modules/machine/valefor/configuration.nix |  1 +
 4 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/flake.lock b/flake.lock
index b5e0cf8..39337ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733570843,
-        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
+        "lastModified": 1738743987,
+        "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
+        "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734366194,
-        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
+        "lastModified": 1736373539,
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
@@ -58,47 +58,13 @@
         "type": "github"
       }
     },
-    "nix-ld": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1734338723,
-        "narHash": "sha256-BpJs2QnVwdE4Btsx2BcBmdsq86H7QJYv2GmoOkr1ii4=",
-        "owner": "Mic92",
-        "repo": "nix-ld",
-        "rev": "911665df070e3d6c970e5a248fc4a38550bd5689",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "nix-ld",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733015953,
-        "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1734737257,
-        "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=",
+        "lastModified": 1738702386,
+        "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa",
+        "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
         "type": "github"
       },
       "original": {
@@ -113,8 +79,7 @@
         "darwin": "darwin",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nix-ld": "nix-ld",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 21e9401..d893951 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
-    nix-ld.url = "github:Mic92/nix-ld";
     home-manager = {
       url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -18,7 +17,6 @@
     self,
     nixpkgs,
     nix-flatpak,
-    nix-ld,
     darwin,
     home-manager,
     ...
@@ -59,7 +57,6 @@
       };
       modules = [
         nix-flatpak.nixosModules.nix-flatpak
-        nix-ld.nixosModules.nix-ld
         ./modules/common
         ./modules/machine/cloud
 
@@ -83,7 +80,6 @@
         hostname = "valefor";
       };
       modules = [
-        nix-ld.nixosModules.nix-ld
         ./modules/common
         ./modules/machine/valefor
 
diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix
index 478666c..eb691c5 100644
--- a/modules/machine/cloud/configuration.nix
+++ b/modules/machine/cloud/configuration.nix
@@ -59,6 +59,7 @@ in {
     wttrbar
     cliphist
     patchelf
+    nix-ld
   ];
 
   # Set the EDITOR global environment variable to neovim
diff --git a/modules/machine/valefor/configuration.nix b/modules/machine/valefor/configuration.nix
index dc84590..53930bf 100644
--- a/modules/machine/valefor/configuration.nix
+++ b/modules/machine/valefor/configuration.nix
@@ -33,6 +33,7 @@
     neovim
     git
     patchelf
+    nix-ld
   ];
 
   # Set the EDITOR global environment variable to neovim