diff --git a/flake.nix b/flake.nix index 7c685e5..e36b027 100644 --- a/flake.nix +++ b/flake.nix @@ -274,7 +274,7 @@ ttspaste = prev.callPackage packages/ttspaste.nix { }; unicodmenu = prev.callPackage packages/unicodmenu.nix { }; vg = prev.callPackage packages/vg.nix { }; - vim-kmein = prev.callPackage packages/vim.nix {}; + vim-kmein = prev.callPackage packages/vim-kmein {}; vimv = prev.callPackage packages/vimv.nix { }; klem = prev.callPackage packages/klem.nix { }; diff --git a/packages/obsidian-vim.nix b/packages/obsidian-vim.nix index 26f0ea3..b651c18 100644 --- a/packages/obsidian-vim.nix +++ b/packages/obsidian-vim.nix @@ -7,7 +7,7 @@ neovim.override { configure = { customRC = '' - source ${../lib/vim/shared.vim} + source ${./vim-kmein/shared.vim} cd ${obsidiantVaultDirectory} diff --git a/packages/vim.nix b/packages/vim-kmein/default.nix similarity index 95% rename from packages/vim.nix rename to packages/vim-kmein/default.nix index 6aa10e4..2aca1f7 100644 --- a/packages/vim.nix +++ b/packages/vim-kmein/default.nix @@ -11,10 +11,10 @@ }: (neovim.override { configure = { customRC = '' - source ${../lib/vim/shared.vim} - source ${../lib/vim/init.vim} + source ${./shared.vim} + source ${./init.vim} let g:snippet_directory = '${vimPlugins.friendly-snippets}' - luafile ${../lib/vim/init.lua} + luafile ${./init.lua} '' + lib.optionalString (stylixColors != null) (with stylixColors.withHashtag; '' luafile ${writeText "colors.lua" '' require('base16-colorscheme').setup({ diff --git a/lib/vim/init.lua b/packages/vim-kmein/init.lua similarity index 100% rename from lib/vim/init.lua rename to packages/vim-kmein/init.lua diff --git a/lib/vim/init.vim b/packages/vim-kmein/init.vim similarity index 100% rename from lib/vim/init.vim rename to packages/vim-kmein/init.vim diff --git a/lib/vim/shared.vim b/packages/vim-kmein/shared.vim similarity index 100% rename from lib/vim/shared.vim rename to packages/vim-kmein/shared.vim