diff --git a/init.lua b/init.lua index b15b484..ac7cd2d 100644 --- a/init.lua +++ b/init.lua @@ -17,8 +17,9 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup("plugins") -- SET NEOVIM THEME -- -vim.cmd "let g:everforest_background = 'hard'" -vim.cmd.colorscheme('everforest') +vim.o.termguicolors = true +-- vim.cmd "let g:everforest_background = 'hard'" +vim.cmd.colorscheme('nightfox') -- XDEBUG -- local dap = require('dap') @@ -74,14 +75,14 @@ end) local lspconfig = require 'lspconfig' local configs = require 'lspconfig.configs' if not configs.drupal then - configs.drupal = { - default_config = { - cmd = {'drupal-lsp'}, - filetypes = { 'php'}, - root_dir = function(fname) - return lspconfig.util.root_pattern('composer.json', '.git')(fname) - end - }; - } - end -lspconfig.drupal.setup{autostart = true } + configs.drupal = { + default_config = { + cmd = {'drupal-lsp'}, + filetypes = {'php', 'module', 'inc', 'theme'}, + root_dir = function(fname) + return lspconfig.util.root_pattern('composer.json', '.git')(fname) + end + }; + } +end +lspconfig.drupal.setup{ autostart = true } diff --git a/lazy-lock.json b/lazy-lock.json index e0c43fb..db314c3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -15,6 +15,7 @@ "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, + "nightfox": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-dap": { "branch": "master", "commit": "7aade9e99bef5f0735cf966e715b3ce45515d786" }, "nvim-dap-ui": { "branch": "master", "commit": "881a69e25bd6658864fab47450025490b74be878" }, diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua index e2aaa0f..c24b393 100644 --- a/lua/plugins/harpoon.lua +++ b/lua/plugins/harpoon.lua @@ -9,30 +9,9 @@ return { -- REQUIRED harpoon:setup() -- REQUIRED - -- basic telescope configuration - local conf = require("telescope.config").values - local function toggle_telescope(harpoon_files) - local file_paths = {} - for _, item in ipairs(harpoon_files.items) do - table.insert(file_paths, item.value) - end - - require("telescope.pickers").new({}, { - prompt_title = "Harpoon", - finder = require("telescope.finders").new_table({ - results = file_paths, - }), - previewer = conf.file_previewer({}), - sorter = conf.generic_sorter({}), - }):find() - end - -- vim.keymap.set("n", "", function() toggle_telescope(harpoon:list()) end, { desc = "Open harpoon window" }) vim.keymap.set("n", "a", function() harpoon:list():add() end) vim.keymap.set("n", "c", function() harpoon:list():clear() end) vim.keymap.set("n", "r", function() harpoon:list():remove() end) vim.keymap.set("n", "h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) - -- Toggle previous & next buffers stored within Harpoon list - -- vim.keymap.set("n", "", function() harpoon:list():prev() end) - -- vim.keymap.set("n", "", function() harpoon:list():next() end) end } diff --git a/lua/plugins/nightfox.lua b/lua/plugins/nightfox.lua new file mode 100644 index 0000000..07dd19a --- /dev/null +++ b/lua/plugins/nightfox.lua @@ -0,0 +1,5 @@ +return { + "EdenEast/nightfox.nvim", + priority = 1000, + name = "nightfox", +}