diff --git a/lua/modules/theme.lua b/lua/modules/theme.lua index 9ee7cfc..6f3bbce 100644 --- a/lua/modules/theme.lua +++ b/lua/modules/theme.lua @@ -1,4 +1,3 @@ - local function load_theme() require('invero').setup({ highlights = function(c, tool) @@ -14,6 +13,8 @@ local function load_theme() Pmenu = { fg = c.text, bg = c.surface }, PmenuSel = { fg = c.text, bg = c.accent_light }, QuickFixLine = { fg = c.accent, bg = c.none, bold = true }, + ['@lsp'] = { fg = c.syntax, bg = c.none }, + ['@variable'] = { fg = c.syntax, bg = c.none }, } end, }) diff --git a/lua/setup/init.lua b/lua/setup/init.lua index f990335..0753014 100644 --- a/lua/setup/init.lua +++ b/lua/setup/init.lua @@ -10,6 +10,14 @@ local function clone_package_manager() end end +local function load_paq() + vim.cmd.packadd('paq-nvim') + local paq = require('paq') + local packages = require('setup.packages').get() + paq:setup({ lock = vim.fn.stdpath('config') .. '/paq-lock.json' })(packages) + return paq +end + local function install_packages() local done = false vim.api.nvim_create_autocmd('User', { @@ -20,12 +28,7 @@ local function install_packages() end, }) - vim.cmd.packadd('paq-nvim') - local paq = require('paq') - paq:setup({ lock = vim.fn.stdpath("config") .. "/paq-lock.json" }) - local packages = require('setup.packages').get() - - paq(packages) + local paq = load_paq() paq.install() local to_install = paq.query('to_install') @@ -64,6 +67,11 @@ vim.api.nvim_create_user_command('InstallAll', function() print('\n=== Install Finished ===\n\n') end, {}) +vim.api.nvim_create_user_command('Sync', function() + local paq = load_paq() + paq:sync() +end, {}) + vim.api.nvim_create_user_command('FetchLspConfigs', function() local base_url = 'https://raw.githubusercontent.com/neovim/nvim-lspconfig/master/lsp/' diff --git a/paq-lock.json b/paq-lock.json index ab75310..538ef71 100644 --- a/paq-lock.json +++ b/paq-lock.json @@ -1 +1 @@ -{"nvim-ts-autotag":{"name":"nvim-ts-autotag","url":"https://github.com/windwp/nvim-ts-autotag","hash":"","status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-ts-autotag"},"mason.nvim":{"name":"mason.nvim","url":"https://github.com/mason-org/mason.nvim","hash":"","status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/opt/mason.nvim"},"paq-nvim":{"name":"paq-nvim","url":"https://github.com/savq/paq-nvim.git","hash":"971344d1fe1fd93580961815e7b7c8853c3605e4","status":0,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/opt/paq-nvim"},"nvim-autopairs":{"name":"nvim-autopairs","url":"https://github.com/windwp/nvim-autopairs","hash":"","status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-autopairs"},"nvim-tree.lua":{"name":"nvim-tree.lua","url":"https://gitea.tomastm.com/tomas.mirchev/nvim-tree.lua","hash":"","status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-tree.lua"},"nvim-treesitter":{"name":"nvim-treesitter","url":"https://github.com/nvim-treesitter/nvim-treesitter","hash":"","status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-treesitter"},"conform.nvim":{"name":"conform.nvim","url":"https://github.com/stevearc/conform.nvim","hash":"","status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/conform.nvim"},"invero.nvim":{"name":"invero.nvim","url":"https://github.com/triimd/invero.nvim","hash":"","status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/invero.nvim"},"nvim-lint":{"name":"nvim-lint","url":"https://github.com/mfussenegger/nvim-lint","hash":"","status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-lint"}} \ No newline at end of file +{"nvim-ts-autotag":{"status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-ts-autotag","name":"nvim-ts-autotag","url":"https://github.com/windwp/nvim-ts-autotag","hash":""},"nvim-autopairs":{"status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-autopairs","name":"nvim-autopairs","url":"https://github.com/windwp/nvim-autopairs","hash":""},"conform.nvim":{"status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/conform.nvim","name":"conform.nvim","url":"https://github.com/stevearc/conform.nvim","hash":""},"nvim-tree.lua":{"status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-tree.lua","name":"nvim-tree.lua","url":"https://gitea.tomastm.com/tomas.mirchev/nvim-tree.lua","hash":""},"invero.nvim":{"status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/invero.nvim","name":"invero.nvim","url":"https://github.com/triimd/invero.nvim","hash":""},"mason.nvim":{"status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/opt/mason.nvim","name":"mason.nvim","url":"https://github.com/mason-org/mason.nvim","hash":""},"nvim-lint":{"status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-lint","name":"nvim-lint","url":"https://github.com/mfussenegger/nvim-lint","hash":""},"paq-nvim":{"status":0,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/opt/paq-nvim","name":"paq-nvim","url":"https://github.com/savq/paq-nvim.git","hash":"971344d1fe1fd93580961815e7b7c8853c3605e4"},"nvim-treesitter":{"status":1,"dir":"/home/tomas/.local/share/nvim/site/pack/paqs/start/nvim-treesitter","name":"nvim-treesitter","url":"https://github.com/nvim-treesitter/nvim-treesitter","hash":""}} \ No newline at end of file