eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-30 06:59:45 +01:00
Code Issues Releases Wiki Activity

neovim: fix a typo in the generated init.lua (#3252)

Browse source 
neovim complains when having both an init.lua and an init.vim
This commit is contained in:
Joosep Jääger 2022-09-23 11:33:17 +00:00 committed by GitHub
parent bd83eab622
commit de3758e31a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/programs/neovim.nix
View file

@ -365,13 +365,14 @@ in {
in mkMerge ( in mkMerge (
# writes runtime # writes runtime
(map (x: x.runtime) pluginsNormalized) ++ [{ (map (x: x.runtime) pluginsNormalized) ++ [{
"nvim/init.vim" = mkIf (neovimConfig.neovimRcContent != "") { "nvim/init-home-manager.vim" =
text = neovimConfig.neovimRcContent; mkIf (neovimConfig.neovimRcContent != "") {
}; text = neovimConfig.neovimRcContent;
};
"nvim/init.lua" = let "nvim/init.lua" = let
luaRcContent = luaRcContent =
lib.optionalString (neovimConfig.neovimRcContent != "") lib.optionalString (neovimConfig.neovimRcContent != "")
"vim.cmd.source ${config.xdg.configHome}/nvim/init.vim" "vim.cmd [[source ${config.xdg.configHome}/nvim/init-home-manager.vim]]"
+ lib.optionalString hasLuaConfig + lib.optionalString hasLuaConfig
config.programs.neovim.generatedConfigs.lua; config.programs.neovim.generatedConfigs.lua;
in mkIf (luaRcContent != "") { text = luaRcContent; }; in mkIf (luaRcContent != "") { text = luaRcContent; };

2
tests/modules/programs/neovim/plugin-config.nix
View file

@ -24,7 +24,7 @@ with lib;
}; };
nmt.script = '' nmt.script = ''
vimrc="$TESTED/home-files/.config/nvim/init.vim" vimrc="$TESTED/home-files/.config/nvim/init-home-manager.vim"
vimrcNormalized="$(normalizeStorePaths "$vimrc")" vimrcNormalized="$(normalizeStorePaths "$vimrc")"
assertFileExists "$vimrc" assertFileExists "$vimrc"