From 4021a239855bd0e53c5f2eef69172f41da7a9c78 Mon Sep 17 00:00:00 2001
From: Magic_RB <magic_rb@redalder.org>
Date: Thu, 22 Jul 2021 20:20:30 +0200
Subject: [PATCH] Remove explicit references to nixpkgs-unstable

Signed-off-by: Magic_RB <magic_rb@redalder.org>
---
 nix/nixos-modules/vault-agent.nix | 4 +---
 nix/overlays/emacs/default.nix    | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nix/nixos-modules/vault-agent.nix b/nix/nixos-modules/vault-agent.nix
index dc82cf2..33885d2 100644
--- a/nix/nixos-modules/vault-agent.nix
+++ b/nix/nixos-modules/vault-agent.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
 with lib;
 let
-  inherit (config.magic_rb.pkgs) nixpkgs-unstable;
-
   cfg = config.services.vault-agent;
   format = pkgs.formats.json { };
 in
@@ -13,7 +11,7 @@ in
 
       package = mkOption {
         type = types.package;
-        default = nixpkgs-unstable.vault;
+        default = pkgs.vault;
         defaultText = "nixpkgs.vault";
         description = ''
           The package used for the Vault agent and CLI.
diff --git a/nix/overlays/emacs/default.nix b/nix/overlays/emacs/default.nix
index 911d9d9..16779b6 100644
--- a/nix/overlays/emacs/default.nix
+++ b/nix/overlays/emacs/default.nix
@@ -4,8 +4,6 @@ let
   hunspellWithDicts = prev.callPackage ./hunspell-with-dicts.nix {
     dicts = with prev.hunspellDicts; [ en_US ];
   };
-  nixpkgs-unstable = import inputs.nixpkgs-unstable
-    { system = prev.stdenv.system; };
 in
 {
   magic_rb = prev.magic_rb or {} // {
@@ -14,7 +12,7 @@ in
       emacsSrc = inputs.emacs;
       vtermModule = inputs.vtermModule;
 
-      emacsPackages = with nixpkgs-unstable; 
+      emacsPackages = with final; 
         [
           hunspellWithDicts
           
@@ -32,6 +30,10 @@ in
           clang-tools
 
           rnix-lsp
+
+          ghc
+          cabal-install
+          magic_rb.easy-hls-nix
         ];
     };
   };