diff --git a/flake.nix b/flake.nix index a592a4a..c56182c 100644 --- a/flake.nix +++ b/flake.nix @@ -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 diff --git a/home/modules/baseline/vim.nix b/home/modules/baseline/vim.nix index 60624f9..cf0ce32 100644 --- a/home/modules/baseline/vim.nix +++ b/home/modules/baseline/vim.nix @@ -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; }; } diff --git a/home/modules/baseline/vim/config.nix b/home/modules/baseline/vim/config.nix index f586be4..0ece25f 100644 --- a/home/modules/baseline/vim/config.nix +++ b/home/modules/baseline/vim/config.nix @@ -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; [