Fix build errors on 24.05 without web-devicons

This commit is contained in:
Greg Hellings
2024-10-04 10:06:58 -05:00
parent c12ed1b8a9
commit 81f534dd46
3 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -96,7 +96,7 @@
gzip
inject
inject-darwin
(inputs.nixvimunstable.legacyPackages.${system}.makeNixvim (import ./home/modules/baseline/vim/config.nix { inherit pkgs; }))
(inputs.nixvimunstable.legacyPackages.${system}.makeNixvim (import ./home/modules/baseline/vim/config.nix { inherit pkgs; inherit (pkgs) lib; }))
self'.checks.pre-commit-check.enabledPackages
tmux
xonsh
+2 -2
View File
@@ -1,9 +1,9 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
{
# The Hack font is used in the Fugitive sidebars
fonts.fontconfig.enable = true;
home.packages = [ (pkgs.nerdfonts.override { fonts = [ "Hack" ]; }) ];
programs.nixvim = (import ./vim/config.nix { inherit pkgs; }) // { enable = true; };
programs.nixvim = (import ./vim/config.nix { inherit pkgs lib; }) // { enable = true; };
}
+3 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
vim-xonsh = pkgs.vimUtils.buildVimPlugin {
name = "vim-xonsh";
@@ -125,8 +125,9 @@ in
};
neo-tree.enable = true;
notify.enable = true;
} // (if (lib.versionAtLeast lib.version "24.11") then {
web-devicons.enable = true;
};
} else { });
extraConfigLua = builtins.replaceStrings [ "@git@" ] [ "${pkgs.git}/bin/git" ] (builtins.readFile ./extra.lua);
extraConfigVim = builtins.readFile ./extra.vimrc;
extraPlugins = with pkgs.vimPlugins; [