From 006bb4335bb28cda68f1f6dd5261dde7f8e09516 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@jellyfish.co>
Date: Fri, 14 Jun 2024 15:02:16 -0400
Subject: [PATCH] lock nixpkgs until bashls is fixed

---
 nix/home-manager/flake.lock                   | 19 ++++++++++---------
 nix/home-manager/flake.nix                    |  2 +-
 nix/home-manager/modules/packages/default.nix | 11 ++++++-----
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock
index bbedd7b..bcf2c0f 100644
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@@ -86,11 +86,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717931644,
-        "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
+        "lastModified": 1718243258,
+        "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
+        "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1717942814,
-        "narHash": "sha256-hH5+LhWSxuL7t6sLmabXsfdUd5g8l/Gv0cvFzX35rFQ=",
+        "lastModified": 1718288467,
+        "narHash": "sha256-/hcCxvJ9zA7qIzap8NDuXeT6gsiwndc3vjtP0xwwDIQ=",
         "owner": "NixNeovim",
         "repo": "NixNeovimPlugins",
-        "rev": "dfd59a15374e4e4103b7bba84e39b31009a9a8ad",
+        "rev": "c1b8248d6bda2150fe023713156936c801b5a3e6",
         "type": "github"
       },
       "original": {
@@ -230,16 +230,17 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1718108729,
-        "narHash": "sha256-HCAhmNoufdQ9cld7nUSSN49MUYjZcgFRUCi5rwNPg+s=",
+        "lastModified": 1718269811,
+        "narHash": "sha256-tUgqGTbLT2F1g+dxUrm0iTk+Xs32i8HOHVh+WAdQehE=",
         "owner": "nixOS",
         "repo": "nixpkgs",
-        "rev": "e46ce3db0494637b54faa166d437fa6e6d3e2ae3",
+        "rev": "d2679dcbf1a032b0583915a8e3f9faffe936e9f1",
         "type": "github"
       },
       "original": {
         "owner": "nixOS",
         "repo": "nixpkgs",
+        "rev": "d2679dcbf1a032b0583915a8e3f9faffe936e9f1",
         "type": "github"
       }
     },
diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix
index 1798fc2..409c5c4 100644
--- a/nix/home-manager/flake.nix
+++ b/nix/home-manager/flake.nix
@@ -8,7 +8,7 @@
 
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixOS/nixpkgs";
+    nixpkgs = {url = "github:nixOS/nixpkgs/d2679dcbf1a032b0583915a8e3f9faffe936e9f1";};
     flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix
index dc7d3d9..febd726 100644
--- a/nix/home-manager/modules/packages/default.nix
+++ b/nix/home-manager/modules/packages/default.nix
@@ -1,10 +1,10 @@
 {pkgs, ...}: let
   inherit (pkgs.stdenv.hostPlatform) isLinux;
-  systemSpecificPackages =
+  systemSpecificPackages = with pkgs;
     if isLinux
-    # include gping because of open bug
-    then [pkgs.zsh pkgs.racket pkgs.gping pkgs.mold pkgs.zed-editor]
-    else [pkgs.keka];
+    # ncdu (well, all zig packages) don't work on macOS nix right now
+    then [zsh racket mold ncdu zed-editor]
+    else [keka];
 in {
   imports = [
     ./git.nix
@@ -25,6 +25,7 @@ in {
       clipboard-jh
       colima
       curl
+      devenv
       docker-client
       dogdns
       erdtree
@@ -38,6 +39,7 @@ in {
       gnugrep
       gnused
       gnutar
+      gping
       gql
       httpstat
       imagemagick
@@ -50,7 +52,6 @@ in {
       litecli
       magic-wormhole-rs
       martian-mono
-      # ncdu
       neovide
       ov
       page