From 103d563bb23a678015151a0ea64563c9306faf7a Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Mon, 16 May 2022 22:25:53 -0400
Subject: [PATCH] Make home-manager follow nixpkgs

---
 droid.nix  |  2 +-
 flake.lock | 24 ++++++------------------
 flake.nix  |  7 ++++++-
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/droid.nix b/droid.nix
index fdb7ce7..d424c31 100644
--- a/droid.nix
+++ b/droid.nix
@@ -70,7 +70,7 @@
       ## devel-core
       ###
       # Full version of git
-      gitFull
+      git
       # Git addons
       git-secret
       git-lfs
diff --git a/flake.lock b/flake.lock
index e5d6594..ee8b310 100644
--- a/flake.lock
+++ b/flake.lock
@@ -254,7 +254,9 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1652452047,
@@ -451,20 +453,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1652692103,
-        "narHash": "sha256-ygRLh8g0F/WkVCSfQcxMoVaaD45i6Ky+f+b4wCOazag=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "556ce9a40abde33738e6c9eac65f965a8be3b623",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1652559422,
         "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=",
@@ -480,7 +468,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1652541622,
         "narHash": "sha256-Z9BuUCS0IocoRahFvFDJNU5Q+xM5/lS8Ng4JJFH3+UU=",
@@ -656,7 +644,7 @@
         "mozilla": "mozilla",
         "nix-doom-emacs": "nix-doom-emacs",
         "nix-on-droid": "nix-on-droid",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "polymc": "polymc",
         "sops-nix": "sops-nix"
@@ -697,7 +685,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-21_11": "nixpkgs-21_11"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index ae21459..c3421dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,7 @@
     };
     sops-nix.url = "github:Mic92/sops-nix";
     home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     darwin = {
       url = "github:lnl7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -90,7 +91,11 @@
           };
         }
         ({ pkgs, config, unstable, ... }: {
-          home-manager.users.nathan.programs.starship.package = unstable.starship;
+          home-manager.users.nathan.programs = {
+            starship.package = unstable.starship;
+            git.package = unstable.gitFull;
+            fish.package = unstable.fish;
+          };
         })
         ./home.nix
       ];