fix: add haskell and vimplugins overlays

This commit is contained in:
Benjamin Bädorf 2023-11-08 22:45:02 +01:00
parent baba43ea82
commit eb1a5a0a3f
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C

View file

@ -7,16 +7,36 @@
nixosModules = rec { nixosModules = rec {
overlays = ({ ... }: { overlays = ({ ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: let
nixd = inputs.nixpkgs-unstable.legacyPackages.${prev.system}.nixd; unstable = import inputs.nixpkgs-unstable { system = prev.system; };
master = import inputs.nixpkgs-master { system = prev.system; };
scan2paperless = import inputs.scan2paperless { system = prev.system; };
in {
nixd = unstable.nixd;
factorio-headless = inputs.nixpkgs-master.legacyPackages.${prev.system}.factorio-headless; factorio-headless = master.factorio-headless;
paperless-ngx = inputs.nixpkgs-master.legacyPackages.${prev.system}.paperless-ngx; paperless-ngx = master.paperless-ngx;
waybar = inputs.nixpkgs-master.legacyPackages.${prev.system}.waybar; waybar = master.waybar;
scan2paperless = inputs.scan2paperless.legacyPackages.${prev.system}.scan2paperless; scan2paperless = scan2paperless.scan2paperless;
adlist = inputs.adblock-unbound.packages.${prev.system}; adlist = inputs.adblock-unbound.packages.${prev.system};
haskellPackages =
prev.haskellPackages.override
(old: {
overrides = prev.lib.composeExtensions (old.overrides or (_: _: {})) (hfinal: hprev: let
version = prev.lib.replaceChars ["."] [""] prev.ghc.version;
in {
# same for haskell packages, matching ghc versions
inherit
(unstable.haskell.packages."ghc${version}")
haskell-language-server
;
});
});
vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
}) })
(import ../pkgs) (import ../pkgs)
(import ./blesh.nix) (import ./blesh.nix)