diff --git a/config/plugins/neorg.nix b/config/plugins/neorg.nix index 519e8d5..253a316 100644 --- a/config/plugins/neorg.nix +++ b/config/plugins/neorg.nix @@ -1,12 +1,14 @@ # vim: ts=4:sts=0:sw=0:noet { -pkgs-stable +pkgs +, pkgs-stable , ... }: { plugins = { neorg = { enable = true; - package = pkgs-stable.vimPlugins.neorg; + # package = pkgs-stable.vimPlugins.neorg; + package = pkgs.vimPlugins.neorg; modules = { "core.defaults" = {}; # -- Loads default behaviour "core.summary" = {}; diff --git a/flake.nix b/flake.nix index 3802fda..16ff239 100644 --- a/flake.nix +++ b/flake.nix @@ -5,22 +5,33 @@ nixvim.url = "github:nix-community/nixvim"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; flake-utils.url = "github:numtide/flake-utils"; + + # https://github.com/nvim-neorg/nixpkgs-neorg-overlay + # https://github.com/nix-community/nixvim/issues/1395 + neorg-overlay.url = "github:nvim-neorg/nixpkgs-neorg-overlay"; }; outputs = { - self, - nixpkgs, - nixpkgs-stable, - nixvim, - flake-utils, - ... + self + , nixpkgs + , nixpkgs-stable + , nixvim + , flake-utils + , neorg-overlay + , ... } @ inputs: let config = import ./config; # import the module directly in flake-utils.lib.eachDefaultSystem (system: let nixvimLib = nixvim.lib.${system}; - pkgs = import nixpkgs {inherit system;}; - pkgs-stable = import nixpkgs-stable {inherit system;}; + pkgs = import nixpkgs { + inherit system; + nixpkgs.overlays = [ neorg-overlay.overlays.default ]; + }; + pkgs-stable = import nixpkgs-stable { + inherit system; + nixpkgs.overlays = [ neorg-overlay.overlays.default ]; + }; nixvim' = nixvim.legacyPackages.${system}; nvim = nixvim'.makeNixvimWithModule { inherit pkgs;