magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-12-01 20:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove explicit references to nixpkgs-unstable

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2021-07-22 20:20:30 +02:00
parent 8dddfe051a
commit 4021a23985
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nix/nixos-modules/vault-agent.nix
View file

@ -1,8 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let let
inherit (config.magic_rb.pkgs) nixpkgs-unstable;
cfg = config.services.vault-agent; cfg = config.services.vault-agent;
format = pkgs.formats.json { }; format = pkgs.formats.json { };
in in
@ -13,7 +11,7 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = nixpkgs-unstable.vault; default = pkgs.vault;
defaultText = "nixpkgs.vault"; defaultText = "nixpkgs.vault";
description = '' description = ''
The package used for the Vault agent and CLI. The package used for the Vault agent and CLI.

8
nix/overlays/emacs/default.nix
View file

@ -4,8 +4,6 @@ let
hunspellWithDicts = prev.callPackage ./hunspell-with-dicts.nix { hunspellWithDicts = prev.callPackage ./hunspell-with-dicts.nix {
dicts = with prev.hunspellDicts; [ en_US ]; dicts = with prev.hunspellDicts; [ en_US ];
}; };
nixpkgs-unstable = import inputs.nixpkgs-unstable
{ system = prev.stdenv.system; };
in in
{ {
magic_rb = prev.magic_rb or {} // { magic_rb = prev.magic_rb or {} // {
@ -14,7 +12,7 @@ in
emacsSrc = inputs.emacs; emacsSrc = inputs.emacs;
vtermModule = inputs.vtermModule; vtermModule = inputs.vtermModule;
emacsPackages = with nixpkgs-unstable; emacsPackages = with final;
[ [
hunspellWithDicts hunspellWithDicts
@ -32,6 +30,10 @@ in
clang-tools clang-tools
rnix-lsp rnix-lsp
ghc
cabal-install
magic_rb.easy-hls-nix
]; ];
}; };
}; };