diff --git a/symlinks/config/.gitignore b/symlinks/config/.gitignore index 8e33b7c..583dfa0 100644 --- a/symlinks/config/.gitignore +++ b/symlinks/config/.gitignore @@ -67,3 +67,6 @@ kwalletrc Thunar xfce4 Element +NuGet +Microsoft* +.mono diff --git a/symlinks/config/NuGet/.gitignore b/symlinks/config/NuGet/.gitignore deleted file mode 100644 index 88ad27f..0000000 --- a/symlinks/config/NuGet/.gitignore +++ /dev/null @@ -1 +0,0 @@ -nugetorgadd.trk diff --git a/symlinks/config/NuGet/NuGet.Config b/symlinks/config/NuGet/NuGet.Config deleted file mode 100644 index 3f0e003..0000000 --- a/symlinks/config/NuGet/NuGet.Config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/symlinks/config/nvim/lua/lsp/servers.lua b/symlinks/config/nvim/lua/lsp/servers.lua index e5187fe..7476ad9 100644 --- a/symlinks/config/nvim/lua/lsp/servers.lua +++ b/symlinks/config/nvim/lua/lsp/servers.lua @@ -44,3 +44,11 @@ require('flutter-tools').setup { on_attach = on_attach } } + +-- Dotnet LS +local pid = vim.fn.getpid() +local omnisharp_bin = vim.fn.glob('$HOME') .. "/lsp/dotnet/omnisharp/run" +lspconfig.omnisharp.setup { + cmd = { omnisharp_bin, "--languageserver" , "--hostPID", tostring(pid) }; + on_attach = on_attach; +} diff --git a/symlinks/config/nvim/lua/plugin/projectionist.lua b/symlinks/config/nvim/lua/plugin/projectionist.lua new file mode 100644 index 0000000..b3a3a10 --- /dev/null +++ b/symlinks/config/nvim/lua/plugin/projectionist.lua @@ -0,0 +1,209 @@ +local vim_readme_template = { + "# Name", + "", + "## Requirements", + "", + "## Installation", + "", + "## Usage", + "", + "### Commands", + "", + "### Keymaps", + "", + "## License", + "", + "[LICENSE NAME](LICENSE)" +} + +local vim_doc_template = { + "*{}.txt* Description", + "", + "INTRODUCTION *{}*", + "", + "Description", + "", + "CONTENTS *{}-contents*", + "", + " 1. Overview |{}-overview|", + " 2. Requirements |{}-requirements|", + " 3. Installation |{}-installation|", + " 4. Usage |{}-usage|", + " 5. Commands |{}-commands|", + " 6. Functions |{}-functions|", + " 7. Mappings |{}-mappings|", + " 8. Plugs |{}-plugs|", + " 9. Options |{}-options|", + " 10. Issues |{}-issues|", + " 11. Contributing |{}-contributing|", + " 12. Version |{}-version|", + " 13. License |{}-license|", + "", + "OVERVIEW *{}-overview*", + "", + "REQUIREMENTS *{}-requirements*", + "", + "INSTALLATION *{}-installation*", + "", + " 1. Plug ", + "", + " Add the following to your vimrc, or something sourced therein: >", + "", + " Plug 'esensar/{}'", + "<", + " Then install via `:PlugInstall`", + "", + " 2. Pathogen >", + "", + " cd ~/.vim/bundle", + " git clone https://github.com/esensar/{}.git", + "<", + " Then run `:Helptags`", + "", + " 3. Manual", + "", + " Clone this repository and copy the files in plugin/, autoload/, and doc/", + " to their respective directories in your vimfiles, or copy the text from", + " the github repository into new files in those directories. Make sure to", + " run `:helptags`.", + "", + "USAGE *{}-usage*", + "", + "COMMANDS *{}-commands*", + "", + "FUNCTIONS *{}-functions*", + "", + "MAPPINGS *{}-mappings*", + "", + "PLUGS *{}-plugs*", + "", + "OPTIONS *{}-options*", + "", + "ISSUES *{}-issues*", + "", + "If you experience issues using {}, please report them at", + ".", + "", + "CONTRIBUTING *{}-contributing*", + "", + "Feel free to look at already reported issues at ", + ".", + "If available, check out CONTRIBUTING.md in the repository.", + "Otherwise, feel free to create a new issue or pull request.", + "", + "VERSION *{}-version*", + "", + "Version 1.0.0", + "", + "LICENSE *{}-license*", + "", + "vim:tw=78:ts=2:ft=help:norl:" +} + +local flutter_config = { + ["*"] = { + start = "flutter run" + }, + ["lib/*.dart"] = { + alternate = "test/{}_test.dart", + type = "source" + }, + ["test/*_test.dart"] = { + alternate = "lib/{}.dart", + type = "test", + template = { + "import 'package:flutter_test/flutter_test.dart';", + "", + "import 'package:flutter_template/{}.dart';", + "", + "void main() {", + " testWidgets('', (WidgetTester tester) async {", + " });", + "}" + } + } +} + +local python_config = { + ["*.py"] = { + alternate = "tests/{dirname}/test_{basename}.py", + type = "source" + }, + ["tests/**/test_*.py"] = { + alternate = "{dirname}/{basename}.py", + type = "test", + template = { + "import unittest", + "from unittest import mock", + "", + "class {dirname|underscore|camelcase|capitalize}{basename|camelcase|capitalize}Test(unittest.TestCase):", + " pass", + "", + "", + "if __name__ == \"__main__\":", + " unittest.main()" + } + } +} + +local dotnet_config = {} + +local vim_plugin_config = { + ["doc/*.txt"] = { + type = "help", + template = vim_doc_template + }, + ["autoload/*.vim"] = { + type = "autoload", + alternate = "test/{}.vader" + }, + ["test/*.vader"] = { + type = "test", + altername = "autoload/{}.vim" + }, + ["plugin/*.vim"] = { + type = "plugin", + template = { + "if exists(\"g:loaded_{}\") || &cp | finish | endif", + "", + "let g:loaded_{} = 1" + } + }, + ["README.md"] = { + template = vim_readme_template + } +} + +local lua_vim_plugin_config = { + ["doc/*.txt"] = { + type = "help", + template = vim_doc_template + }, + ["plugin/*.vim"] = { + type = "plugin", + template = { + "if exists(\"g:loaded_{}\") || &cp | finish | endif", + "", + "let g:loaded_{} = 1" + } + }, + ["lua/*.lua"] = { + type = "source", + alternate = "test/{}.lua" + }, + ["test/*.lua"] = { + type = "test", + alternate = "lua/{}.lua" + }, + ["README.md"] = { + template = vim_readme_template + } +} + +vim.g.projectionist_heuristics = { + ["pubspec.yaml"] = flutter_config, + ["requirements.txt|pyproject.toml"] = python_config, + ["*.csproj"] = dotnet_config, + ["plugin/|autoload/"] = vim_plugin_config, + ["lua/"] = lua_vim_plugin_config +} diff --git a/symlinks/config/nvim/plugin/projectionist.vim b/symlinks/config/nvim/plugin/projectionist.vim deleted file mode 100644 index 4e24885..0000000 --- a/symlinks/config/nvim/plugin/projectionist.vim +++ /dev/null @@ -1,90 +0,0 @@ -let g:projectionist_heuristics = { - \ "plugin/|autoload/": { - \ "doc/*.txt": { - \ "type": "help", - \ "template": [ - \ "*{}.txt* Description", - \ "", - \ "INTRODUCTION *{}*", - \ "", - \ "Description", - \ "", - \ "CONTENTS *{}-contents*", - \ "", - \ " 1. Overview |{}-overview|", - \ " 2. Requirements |{}-requirements|", - \ " 3. Installation |{}-installation|", - \ " 4. Usage |{}-usage|", - \ " 5. Commands |{}-commands|", - \ " 6. Functions |{}-functions|", - \ " 7. Mappings |{}-mappings|", - \ " 8. Plugs |{}-plugs|", - \ " 9. Options |{}-options|", - \ " 10. Issues |{}-issues|", - \ " 11. Contributing |{}-contributing|", - \ " 12. Version |{}-version|", - \ " 13. License |{}-license|", - \ "", - \ "OVERVIEW *{}-overview*", - \ "", - \ "REQUIREMENTS *{}-requirements*", - \ "", - \ "INSTALLATION *{}-installation*", - \ "", - \ " 1. Plug ", - \ "", - \ " Add the following to your vimrc, or something sourced therein: >", - \ "", - \ " Plug 'esensar/{}'", - \ "<", - \ " Then install via `:PlugInstall`", - \ "", - \ " 2. Pathogen >", - \ "", - \ " cd ~/.vim/bundle", - \ " git clone https://github.com/esensar/{}.git", - \ "<", - \ " Then run `:Helptags`", - \ "", - \ " 3. Manual", - \ "", - \ " Clone this repository and copy the files in plugin/, autoload/, and doc/", - \ " to their respective directories in your vimfiles, or copy the text from", - \ " the github repository into new files in those directories. Make sure to", - \ " run `:helptags`.", - \ "", - \ "USAGE *{}-usage*", - \ "", - \ "COMMANDS *{}-commands*", - \ "", - \ "FUNCTIONS *{}-functions*", - \ "", - \ "MAPPINGS *{}-mappings*", - \ "", - \ "PLUGS *{}-plugs*", - \ "", - \ "OPTIONS *{}-options*", - \ "", - \ "ISSUES *{}-issues*", - \ "", - \ "If you experience issues using {}, please report them at", - \ ".", - \ "", - \ "CONTRIBUTING *{}-contributing*", - \ "", - \ "Feel free to look at already reported issues at ", - \ ".", - \ "If available, check out CONTRIBUTING.md in the repository.", - \ "Otherwise, feel free to create a new issue or pull request.", - \ "", - \ "VERSION *{}-version*", - \ "", - \ "Version 1.0.0", - \ "", - \ "LICENSE *{}-license*", - \ "", - \ "vim:tw=78:ts=2:ft=help:norl:" - \ ] - \ }, - \ } - \ } diff --git a/symlinks/tool-versions b/symlinks/tool-versions index 1286d2a..193b83d 100644 --- a/symlinks/tool-versions +++ b/symlinks/tool-versions @@ -1,7 +1,7 @@ clojure 1.10.2.774 dart 2.12.0-259.0.dev direnv 2.27.0 -flutter 1.22.6-stable +flutter 2.0.3-stable leiningen 2.9.5 nodejs 15.5.0 poetry 1.1.4