5 files changed, 31 insertions, 8 deletions
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 56f1993..547c8dc 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -14,7 +14,7 @@ require('mason-lspconfig').setup({
 		'yamlls',
 		'jdtls',
 		'bashls',
-		'lua_ls'
+		'lua_ls',
 	},
 	handlers = {
 		lsp.default_setup,
@@ -69,12 +69,19 @@ require('lspconfig/prolog_lsp')
 lsp.configure('prolog_lsp', {force_setup = true})
 lsp.setup()
 
-require'lspconfig'.phpactor.setup{
-    on_attach = on_attach,
-    init_options = {
-        ["language_server_phpstan.enabled"] = false,
-        ["language_server_psalm.enabled"] = false,
-    }
+require('phpactor').setup {
+	install = {
+		branch = "master",
+		bin = "/home/freya/.local/bin/phpactor",
+		php_bin = "php",
+		composer_bin = "composer",
+		git_bin = "git",
+		check_on_startup = "none",
+	},
+	lspconfig = {
+		enabled = true,
+		options = {},
+	},
 }
 
 vim.diagnostic.config({
@@ -83,4 +90,3 @@ vim.diagnostic.config({
 
 require("neodev").setup()
 require("nvim-surround").setup()
-require("toggleterm").setup()
diff --git a/.config/nvim/lua/plugin.lua b/.config/nvim/lua/plugin.lua
index 0aa0611..13fce87 100644
--- a/.config/nvim/lua/plugin.lua
+++ b/.config/nvim/lua/plugin.lua
@@ -37,5 +37,7 @@ Plug('goolord/alpha-nvim')
 Plug('Darazaki/indent-o-matic')
 Plug('iamcco/markdown-preview.nvim', {["do"] =  "cd app && npx --yes yarn install"})
 Plug('skywind3000/asyncrun.vim')
+Plug('folke/todo-comments.nvim')
+Plug('gbprod/phpactor.nvim')
 
 vim.call('plug#end')
diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua
index cfcfb04..c0acb8f 100644
--- a/.config/nvim/lua/theme.lua
+++ b/.config/nvim/lua/theme.lua
@@ -40,6 +40,8 @@ require('lualine').setup {
 	},
 }
 
+require('todo-comments').setup()
+
 require('indent-o-matic').setup {
     max_lines = 2048,
     standard_widths = { 2, 4, 8 },
diff --git a/.config/nvim/lua/treesitter.lua b/.config/nvim/lua/treesitter.lua
index b383d79..7b578d6 100644
--- a/.config/nvim/lua/treesitter.lua
+++ b/.config/nvim/lua/treesitter.lua
@@ -26,4 +26,7 @@ require('nvim-treesitter.configs').setup {
     end,
     additional_vim_regex_highlighting = false,
   },
+  indent = {
+	enable = true
+  }
 }
diff --git a/.config/nvim/lua/vimopt.lua b/.config/nvim/lua/vimopt.lua
index 1114a66..d205926 100644
--- a/.config/nvim/lua/vimopt.lua
+++ b/.config/nvim/lua/vimopt.lua
@@ -20,3 +20,13 @@ vim.filetype.add({
 		['.*%.php.m4'] = 'php',
 	}
 })
+
+vim.api.nvim_create_autocmd({ "BufWritePre" }, {
+  pattern = { "*" },
+  command = [[%s/\s\+$//e]],
+})
+
+vim.api.nvim_create_autocmd({ "BufWritePost" }, {
+  pattern = { "*.md" },
+  command = 'silent !pandoc % --output=/home/freya/.temp.pdf'
+})