diff --git a/home/common/nvim/default.nix b/home/common/nvim/default.nix index f60aa02..6411106 100644 --- a/home/common/nvim/default.nix +++ b/home/common/nvim/default.nix @@ -10,7 +10,7 @@ in VISUAL = "${pkgs.lib.getExe pkgs.neovim}"; }; xdg.configFile."nvim/spell".source = ./spell; - xdg.configFile."nvim/vimscript".source = ./vimscript; + xdg.configFile."nvim/plugin".source = ./plugin; xdg.configFile."nvim/lazy-lock.json".source = mkOutOfStoreSymlink "${dotfilesDir}/home/common/nvim/lazy-lock.json"; xdg.configFile."nvim/lua/tomodachi94".source = ./lua/tomodachi94; diff --git a/home/common/nvim/lua/tomodachi94/init.lua b/home/common/nvim/lua/tomodachi94/init.lua index 1bfd9d7..4a7d4e8 100644 --- a/home/common/nvim/lua/tomodachi94/init.lua +++ b/home/common/nvim/lua/tomodachi94/init.lua @@ -1,9 +1,6 @@ -- This code is in the lua/tomodachi94 directory so that the code remains self-contained. -- The root init.lua should require() this code. --- loads old vimscript things -vim.cmd("source ~/.config/nvim/vimscript/no-autoload/source-vimscript.vim") - require("tomodachi94.options") require("tomodachi94.keybinds") require("tomodachi94.autocmds") diff --git a/home/common/nvim/vimscript/.gitkeep b/home/common/nvim/vimscript/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/home/common/nvim/vimscript/no-autoload/README.md b/home/common/nvim/vimscript/no-autoload/README.md deleted file mode 100644 index cd943ea..0000000 --- a/home/common/nvim/vimscript/no-autoload/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# `no-autoload` - -Prevents autoloading by `source-vimscript.vim`. - -`source-vimscript.vim` is in here to prevent a recursion error. diff --git a/home/common/nvim/vimscript/no-autoload/source-vimscript.vim b/home/common/nvim/vimscript/no-autoload/source-vimscript.vim deleted file mode 100644 index 26f9b94..0000000 --- a/home/common/nvim/vimscript/no-autoload/source-vimscript.vim +++ /dev/null @@ -1,3 +0,0 @@ -for file in split(glob("~/.config/nvim/vimscript/*.vim"), "\n") - execute "source" file -endfor \ No newline at end of file