diff --git a/jrpotter/default.nix b/jrpotter/default.nix index 090a98f..0f0567e 100644 --- a/jrpotter/default.nix +++ b/jrpotter/default.nix @@ -18,6 +18,7 @@ gnumake mullvad-vpn python3 + unzip wezterm zotero ]; diff --git a/jrpotter/neovim/lang/elixir.nix b/jrpotter/neovim/lang/elixir.nix index 923113f..0d95eac 100644 --- a/jrpotter/neovim/lang/elixir.nix +++ b/jrpotter/neovim/lang/elixir.nix @@ -3,10 +3,6 @@ programs.neovim = { nvim-lspconfig = '' require('init.lsp').setup(require('lspconfig').elixirls) { - -- Keep command relative. Compatibility of `elixir-ls` depends tightly - -- on -- the version of elixir being used so this allows local (i.e. - -- within nix shells) versions of `elixir-ls` to override the version - -- specified -- in `extraPackages`. cmd = { 'elixir-ls' }, } ''; diff --git a/jrpotter/neovim/lang/python.nix b/jrpotter/neovim/lang/python.nix index dd5aa24..4b1b7f7 100644 --- a/jrpotter/neovim/lang/python.nix +++ b/jrpotter/neovim/lang/python.nix @@ -12,9 +12,7 @@ in { programs.neovim = { nvim-dap = '' - require('init.python').nvim_dap({ - command = '${venv}/bin/python3.10', - }) + require('init.python').nvim_dap() ''; nvim-lspconfig = '' diff --git a/jrpotter/neovim/lua/init/python.lua b/jrpotter/neovim/lua/init/python.lua index 2b5cd8a..af2d244 100644 --- a/jrpotter/neovim/lua/init/python.lua +++ b/jrpotter/neovim/lua/init/python.lua @@ -1,13 +1,13 @@ local M = {} -function M.nvim_dap(options) +function M.nvim_dap() local dap = require('dap') dap.adapters.python = function(callback, config) callback({ name = 'debugpy', type = 'executable', - command = options.command, + command = 'python3', args = { '-m', 'debugpy.adapter' }, options = { source_filetype = 'python',