From bdc0de8b47e7e5836e3b586bbf356503981faef0 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Wed, 6 Nov 2024 14:33:49 -0500
Subject: [PATCH] flakeup

---
 flake.lock                     | 39 ++++++++++++++++++++++++++--------
 flake.nix                      |  6 +++++-
 home/home.nix                  |  4 ++++
 system/eddie/configuration.nix | 24 ++++++++++++++++++++-
 4 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1a18179..e1c258b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -197,13 +197,33 @@
         "type": "github"
       }
     },
+    "nix-ld": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728031945,
+        "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=",
+        "owner": "Mic92",
+        "repo": "nix-ld",
+        "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-ld",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1730828750,
-        "narHash": "sha256-XrnZLkLiBYNlwV5gus/8DT7nncF1TS5la6Be7rdVOpI=",
+        "lastModified": 1730919458,
+        "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2e78b1af8025108ecd6edaa3ab09695b8a4d3d55",
+        "rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
         "type": "github"
       },
       "original": {
@@ -215,11 +235,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730531603,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
+        "lastModified": 1730785428,
+        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
+        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
         "type": "github"
       },
       "original": {
@@ -270,11 +290,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730824362,
-        "narHash": "sha256-gRQr2K0vo2xuaPC8v11ZkViVlvj3SSn5DwzLYLhlEJ4=",
+        "lastModified": 1730913476,
+        "narHash": "sha256-lnTw/I9EiMDS7g0kuZpj8f3djeuv2lCapqD0jdqibjg=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "c20dd1acb20fb0bb10671f43435ee7df7c6b8657",
+        "rev": "555bbbedcfa9a167a2d7659f9346b891c90750d9",
         "type": "github"
       },
       "original": {
@@ -305,6 +325,7 @@
         "kmonad": "kmonad",
         "musnix": "musnix",
         "nix-flatpak": "nix-flatpak",
+        "nix-ld": "nix-ld",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
diff --git a/flake.nix b/flake.nix
index c32864e..73b01a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,11 +30,14 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nix-ld.url = "github:Mic92/nix-ld";
+    nix-ld.inputs.nixpkgs.follows = "nixpkgs";
+
     #razer-laptop-control.url = "path:/home/emenel/source/_src/razer-laptop-control-no-dkms";
     # razer-laptop-control.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs @ {self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, ... }: {
+  outputs = inputs @ {nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, nix-ld, ... }: {
     nixpkgs.overlays = [ inputs.nixpkgs-wayland.overlay ];
 
     nixosConfigurations = {
@@ -44,6 +47,7 @@
           nix-flatpak.nixosModules.nix-flatpak
           kmonad.nixosModules.default
           musnix.nixosModules.musnix
+          nix-ld.nixosModules.nix-ld
           # razer-laptop-control.nixosModules.default
 	        ./system/eddie/configuration.nix
         ];
diff --git a/home/home.nix b/home/home.nix
index 8afec83..2818469 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -17,6 +17,7 @@
       gnutar
       unzip
       zip
+      stdenv
       htop
       dconf
       dconf2nix
@@ -121,6 +122,9 @@
       libGLU
       glpng
       libGL
+      # fontconfig
+      # freetype
+      nix-ld
 
       # node packages
       nodePackages.typescript-language-server
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index b7bd205..106a6f9 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -33,6 +33,8 @@
     libgtop
     ulauncher
     fontconfig
+    freetype
+    nix-ld
   ];
 
   # Bootloader.
@@ -287,7 +289,27 @@
     binfmt = true;
   };
 
-  programs.nix-ld.enable = true;
+  programs.nix-ld.dev.enable = true;
+  programs.nix-ld.dev.libraries = with pkgs; [
+      zlib
+      zstd
+      stdenv.cc.cc
+      curl
+      openssl
+      attr
+      libssh
+      bzip2
+      libxml2
+      acl
+      libsodium
+      util-linux
+      xz
+      systemd
+      fontconfig
+      freetype
+  ];
+
+  fonts.fontconfig.enable = true;
 
   powerManagement = {
     enable = true;