diff --git a/nix/home.nix b/nix/home.nix index 9bb9694..ca8d8f1 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -35,6 +35,8 @@ home.sessionVariables = { EDITOR = "nvim"; VISUAL = "nvim"; + PIPENV_VENV_IN_PROJECT = 1; + POETRY_VIRTUALENVS_IN_PROJECT = 1; }; home.sessionPath = [ diff --git a/nix/nushell/env.nu b/nix/nushell/env.nu index 9ffd161..b786819 100644 --- a/nix/nushell/env.nu +++ b/nix/nushell/env.nu @@ -110,6 +110,8 @@ $env.PATH = ($env.PATH | uniq) $env.EDITOR = nvim $env.VISUAL = nvim +$env.PIPENV_VENV_IN_PROJECT = 1 +$env.POETRY_VIRTUALENVS_IN_PROJECT = 1 $env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/ssh-agent" ls (($nu.default-config-dir | path join ('scripts/**/*.nu')) | into glob) | diff --git a/nix/nvim/lsp/outline.nix b/nix/nvim/lsp/outline.nix index 2524f8b..321b7b7 100644 --- a/nix/nvim/lsp/outline.nix +++ b/nix/nvim/lsp/outline.nix @@ -15,9 +15,9 @@ }; } ]; - extraPlugins = [ - pkgs.vimPlugins.outline-nvim + extraPlugins = with pkgs.vimPlugins; [ + outline-nvim ]; - extraConfigLua=''require("outline").setup({})''; + extraConfigLua = ''require("outline").setup({})''; }; } diff --git a/nix/nvim/simpleplugins.nix b/nix/nvim/simpleplugins.nix index ca4dd67..7103301 100644 --- a/nix/nvim/simpleplugins.nix +++ b/nix/nvim/simpleplugins.nix @@ -12,8 +12,10 @@ enable = true; addDefaultMappings = true; }; - extraPlugins = [ - pkgs.vimPlugins.vim-numbertoggle + extraPlugins = with pkgs.vimPlugins; [ + vim-numbertoggle + dressing-nvim ]; + extraConfigLua = ''require("dressing").setup({})''; }; } diff --git a/nix/nvim/treesitter/arial.nix b/nix/nvim/treesitter/arial.nix index c79e812..971a6cf 100644 --- a/nix/nvim/treesitter/arial.nix +++ b/nix/nvim/treesitter/arial.nix @@ -15,9 +15,9 @@ }; } ]; - extraPlugins = [ - pkgs.vimPlugins.aerial-nvim + extraPlugins = with pkgs.vimPlugins; [ + aerial-nvim ]; - extraConfigLua=''require("aerial").setup({})''; + extraConfigLua = ''require("aerial").setup({})''; }; } diff --git a/nix/nvim/treesitter/treesitter.nix b/nix/nvim/treesitter/treesitter.nix index a1ae9c7..cef6fca 100644 --- a/nix/nvim/treesitter/treesitter.nix +++ b/nix/nvim/treesitter/treesitter.nix @@ -12,10 +12,10 @@ }; plugins.treesitter-context.enable = true; plugins.indent-blankline.enable = true; - extraPlugins = [ - pkgs.vimPlugins.treesj + extraPlugins = with pkgs.vimPlugins; [ + treesj ]; - extraConfigLua=''require("treesj").setup({})''; + extraConfigLua = ''require("treesj").setup({})''; }; imports = [ ./rainbow-delimiters.nix