diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 478c58a..c018500 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,7 @@ jobs: matrix: include: - package_name: nvim + - package:name: nvim-min steps: - uses: actions/checkout@v3 - uses: DeterminateSystems/nix-installer-action@main diff --git a/flake.nix b/flake.nix index 864835f..a7a38fe 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,7 @@ packages = rec { default = nvim; nvim = pkgs.nvim-pkg; + nvim-min = pkgs.nvim-min-pkg; }; devShells = { default = shell; diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix index ffc41ed..40896cb 100644 --- a/nix/neovim-overlay.nix +++ b/nix/neovim-overlay.nix @@ -83,10 +83,9 @@ with final.pkgs.lib; let yamllint puppet-lint gopls - pyright + python312Packages.jedi-language-server nil phpactor - golangci-lint ]; in { nvim-pkg = mkNeovim { @@ -95,6 +94,12 @@ in { inherit extraPackages; }; + nvim-min-pkg = mkNeovim { + plugins = all-plugins; + appName = "nvim"; + extraPackages = []; + }; + nvim-luarc-json = final.mk-luarc-json { plugins = all-plugins; }; diff --git a/nvim/after/plugin/color.lua b/nvim/after/plugin/color.lua index c5f3a8b..0013e1b 100644 --- a/nvim/after/plugin/color.lua +++ b/nvim/after/plugin/color.lua @@ -1,7 +1,7 @@ vim.cmd('colorscheme terafox') -vim.api.nvim_set_hl(0, 'GitSignsAdd', { fg = "green", bold = true }) -vim.api.nvim_set_hl(0, 'GitSignsDelete', { fg = "red", bold = true}) -vim.api.nvim_set_hl(0, 'GitSignsChange', { fg = "green", bold = true}) +vim.api.nvim_set_hl(0, 'GitSignsAdd', { fg = 'green', bold = true }) +vim.api.nvim_set_hl(0, 'GitSignsDelete', { fg = 'red', bold = true }) +vim.api.nvim_set_hl(0, 'GitSignsChange', { fg = 'green', bold = true }) vim.api.nvim_set_hl(0, 'EyelinerPrimary', { underline = true }) vim.api.nvim_set_hl(0, 'EyelinerSecondary', { underline = true }) @@ -22,7 +22,7 @@ vim.keymap.set( ts.extensions.aerial.aerial, { noremap = true, silent = true, desc = 'Fuzzy find treesitter objects' } ) -ts.load_extension("scope") +ts.load_extension('scope') vim.keymap.set( 'n', 'fb', diff --git a/nvim/plugin/lsp.lua b/nvim/plugin/lsp.lua index 0fa5daa..887b316 100644 --- a/nvim/plugin/lsp.lua +++ b/nvim/plugin/lsp.lua @@ -35,7 +35,7 @@ lspconfig.gopls.setup { vim.api.nvim_command('au BufWritePre lua vim.lsp.buf.format { async = false }') end, } -lspconfig.pyright.setup { capabilities = capabilities } +lspconfig.jedi_language_server.setup { capabilities = capabilities } lspconfig.nil_ls.setup { capabilities = capabilities } lspconfig.phpactor.setup { capabilities = capabilities } @@ -105,14 +105,9 @@ vim.api.nvim_create_autocmd('LspAttach', { vim.lsp.codelens.run, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP codelens' } ) - vim.keymap.set( - 'n', - 'dh', - function() - vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) - end, - { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP hints toggle' } - ) + vim.keymap.set('n', 'dh', function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) + end, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP hints toggle' }) vim.keymap.set('n', 'df', function() vim.lsp.buf.format { async = true } end, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP format' }) @@ -135,10 +130,9 @@ vim.api.nvim_create_autocmd('LspAttach', { }) local none = require('null-ls') -none.setup({ - sources = { - none.builtins.diagnostics.golangci_lint, - none.builtins.diagnostics.puppet_lint, - none.builtins.diagnostics.yamllint, - }, -}) +none.setup { + sources = { + none.builtins.diagnostics.puppet_lint, + none.builtins.diagnostics.yamllint, + }, +} diff --git a/nvim/plugin/misc.lua b/nvim/plugin/misc.lua index 47ae014..acb37ef 100644 --- a/nvim/plugin/misc.lua +++ b/nvim/plugin/misc.lua @@ -30,11 +30,16 @@ vim.keymap.set( 'Telescope neoclip', { noremap = true, silent = true, desc = 'Pick clipboard history' } ) -local snipe = require("snipe") -snipe.setup({ +local snipe = require('snipe') +snipe.setup { ui = { - position = "center", + position = 'center', }, - sort = "last", -}) -vim.keymap.set('n', '', snipe.open_buffer_menu, { noremap = true, silent = true, desc = 'Pick buffers (snipe.nvim)' }) + sort = 'last', +} +vim.keymap.set( + 'n', + '', + snipe.open_buffer_menu, + { noremap = true, silent = true, desc = 'Pick buffers (snipe.nvim)' } +) diff --git a/nvim/plugin/neogit.lua b/nvim/plugin/neogit.lua index 795c8e6..533fe8f 100644 --- a/nvim/plugin/neogit.lua +++ b/nvim/plugin/neogit.lua @@ -2,12 +2,12 @@ if vim.g.did_load_neogit_plugin then return end vim.g.did_load_neogit_plugin = true -require("diffview").setup({ +require('diffview').setup { enhanced_diff_hl = true, default_args = { - DiffviewOpen = {"--imply-local"}, + DiffviewOpen = { '--imply-local' }, }, -}) +} local neogit = require('neogit') neogit.setup { disable_builtin_notifications = true,