fix(nvim): use unstable pkgset
All checks were successful
/ check (push) Successful in 26s
/ build (audiomenu) (push) Successful in 1s
/ build (docs) (push) Successful in 1s
/ build (jpassmenu) (push) Successful in 1s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 1s
/ build (nvim) (push) Successful in 1s

Instead of setting some specific unstable packages, make nixvim always
use packages from nixos-unstable.
This commit is contained in:
Jalil David Salamé Messina 2024-10-14 09:31:19 +02:00
parent f30afe506b
commit 8b2984be90
Signed by: jalil
GPG key ID: F016B9E770737A0B
6 changed files with 40 additions and 21 deletions

View file

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

View file

@ -183,7 +183,7 @@ in
servers = {
bashls = {
enable = true;
package = pkgs.unstable.bash-language-server;
package = pkgs.bash-language-server;
};
# clangd.enable = true; # Adds ~2GiB
# html.enable = true; # Not writing html

View file

@ -1,4 +1,11 @@
{ pkgs, ... }:
{ standalone }:
{
pkgs,
system,
unstable,
lib,
...
}:
{
imports = [
./options.nix
@ -8,6 +15,7 @@
];
config = {
nixpkgs = lib.optionalAttrs standalone { pkgs = import unstable { inherit system; }; };
globals.mapleader = " ";
# Appearance
colorschemes.gruvbox = {
@ -42,8 +50,8 @@
};
extraPlugins =
let
plugins = pkgs.unstable.vimPlugins;
extraPlugins = import ./extraPlugins { pkgs = pkgs.unstable; };
plugins = pkgs.vimPlugins;
extraPlugins = import ./extraPlugins { inherit pkgs; };
in
[
plugins.nui-nvim
@ -53,15 +61,15 @@
];
# Formatting & linters
extraPackages = [
pkgs.unstable.luajitPackages.jsregexp
pkgs.unstable.shfmt
pkgs.unstable.silicon
pkgs.unstable.statix
pkgs.unstable.stylua
pkgs.unstable.taplo
pkgs.unstable.typos
pkgs.unstable.yamlfmt
(pkgs.unstable.python3.withPackages (p: [ p.jupytext ]))
pkgs.luajitPackages.jsregexp
pkgs.shfmt
pkgs.silicon
pkgs.statix
pkgs.stylua
pkgs.taplo
pkgs.typos
pkgs.yamlfmt
(pkgs.python3.withPackages (p: [ p.jupytext ]))
];
extraConfigLuaPre =
# lua