From 1a627d18286ed9b6126f5960a93582094f454549 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Tue, 5 Nov 2024 12:00:00 +0000
Subject: [PATCH] Use the unstable overlay in other places

---
 lib/shared/home-manager.nix   | 7 ++-----
 lib/shared/modules/git.nix    | 4 ++--
 lib/shared/modules/neovim.nix | 9 ++-------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/lib/shared/home-manager.nix b/lib/shared/home-manager.nix
index 7eecc26..a2c947f 100644
--- a/lib/shared/home-manager.nix
+++ b/lib/shared/home-manager.nix
@@ -4,9 +4,6 @@
   username,
   self,
 }:
-let
-  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
-in
 {
   home.username = "${username}";
   home.homeDirectory = "/home/${username}";
@@ -19,8 +16,8 @@ in
   programs.home-manager.enable = true;
 
   imports = [
-    (import ./modules/git.nix { inherit inputs pkgs pkgsUnstable; })
-    (import ./modules/neovim.nix { inherit inputs pkgs pkgsUnstable; })
+    (import ./modules/git.nix { inherit inputs pkgs; })
+    (import ./modules/neovim.nix { inherit inputs pkgs; })
     ./modules/bat.nix
     ./modules/bin.nix
     ./modules/direnv.nix
diff --git a/lib/shared/modules/git.nix b/lib/shared/modules/git.nix
index 26b9fb8..f62e73d 100644
--- a/lib/shared/modules/git.nix
+++ b/lib/shared/modules/git.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgsUnstable, ... }:
+{ pkgs, ... }:
 
 {
   home.file.".gitmessage".text = ''
@@ -146,7 +146,7 @@
     };
   };
 
-  home.packages = with pkgsUnstable; [ git-instafix ];
+  home.packages = with pkgs.unstable; [ git-instafix ];
 
   home.sessionVariables = {
     GIT_INSTAFIX_UPSTREAM = "origin/main";
diff --git a/lib/shared/modules/neovim.nix b/lib/shared/modules/neovim.nix
index b086118..010df70 100644
--- a/lib/shared/modules/neovim.nix
+++ b/lib/shared/modules/neovim.nix
@@ -1,15 +1,10 @@
-{
-  inputs,
-  pkgs,
-  pkgsUnstable,
-  ...
-}:
+{ inputs, pkgs, ... }:
 
 {
   programs.neovim = {
     enable = true;
 
-    package = pkgsUnstable.neovim-unwrapped;
+    package = pkgs.unstable.neovim-unwrapped;
 
     plugins = with pkgs.vimPlugins; [
       comment-nvim