greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix build errors on 24.05 without web-devicons

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+1 -1
View File
@@ -96,7 +96,7 @@
gzip gzip
inject inject
inject-darwin 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 self'.checks.pre-commit-check.enabledPackages
tmux tmux
xonsh xonsh
home/modules/baseline/vim.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
# The Hack font is used in the Fugitive sidebars # The Hack font is used in the Fugitive sidebars
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = [ (pkgs.nerdfonts.override { fonts = [ "Hack" ]; }) ]; 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; };
} }
home/modules/baseline/vim/config.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, ... }:
let let
vim-xonsh = pkgs.vimUtils.buildVimPlugin { vim-xonsh = pkgs.vimUtils.buildVimPlugin {
name = "vim-xonsh"; name = "vim-xonsh";
@@ -125,8 +125,9 @@ in
}; };
neo-tree.enable = true; neo-tree.enable = true;
notify.enable = true; notify.enable = true;
} // (if (lib.versionAtLeast lib.version "24.11") then {
web-devicons.enable = true; web-devicons.enable = true;
}; } else { });
extraConfigLua = builtins.replaceStrings [ "@git@" ] [ "${pkgs.git}/bin/git" ] (builtins.readFile ./extra.lua); extraConfigLua = builtins.replaceStrings [ "@git@" ] [ "${pkgs.git}/bin/git" ] (builtins.readFile ./extra.lua);
extraConfigVim = builtins.readFile ./extra.vimrc; extraConfigVim = builtins.readFile ./extra.vimrc;
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [