fix(nvim): conflict with using global packages

Now it is an error to override the pkgs if global packages are being
used.
This commit is contained in:
Jalil David Salamé Messina 2025-01-18 11:27:40 +01:00
parent 440bf3cbf8
commit 7963190ef1
Signed by: jalil
GPG key ID: F016B9E770737A0B
4 changed files with 11 additions and 30 deletions

View file

@ -1,4 +1,3 @@
{ system, unstable }:
{ lib, config, ... }:
let
cfg = config.jhome.nvim;
@ -7,9 +6,8 @@ in
imports = [ ./options.nix ];
config.programs.nixvim = lib.mkMerge [
(import ./standalone.nix { standalone = false; })
(import ./standalone.nix)
(lib.mkIf cfg.enable {
nixpkgs = lib.mkForce { pkgs = import unstable { inherit system; }; };
enable = true;
defaultEditor = lib.mkDefault true;
jhome.nvim = cfg;

View file

@ -1,11 +1,4 @@
{ standalone }:
{
pkgs,
system,
unstable,
lib,
...
}:
{ pkgs, ... }:
{
imports = [
./options.nix
@ -17,7 +10,6 @@
config = {
withRuby = false;
nixpkgs = lib.optionalAttrs standalone { pkgs = unstable.legacyPackages.${system}; };
globals.mapleader = " ";
# Appearance
colorschemes.gruvbox = {