From 41eff7f1d816c0340ae3266e0026cbaa53b6b642 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 25 Jan 2022 11:22:42 -0500
Subject: [PATCH] use direnv instead of poetry

---
 direnvrc.symlink                  | 13 +++++++++++++
 nvim.configlink/init.lua          | 10 ++--------
 starship/starship.toml.configlink |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 direnvrc.symlink

diff --git a/direnvrc.symlink b/direnvrc.symlink
new file mode 100644
index 0000000..878c1ca
--- /dev/null
+++ b/direnvrc.symlink
@@ -0,0 +1,13 @@
+layout_poetry() {
+  if [[ ! -f pyproject.toml ]]; then
+    log_error 'No pyproject.toml found. Use `poetry new` or `poetry init` to create one first.'
+    exit 2
+  fi
+
+  # create venv if it doesn't exist
+  poetry run true
+
+  export VIRTUAL_ENV=$(poetry env info --path)
+  export POETRY_ACTIVE=1
+  PATH_add "$VIRTUAL_ENV/bin"
+}
diff --git a/nvim.configlink/init.lua b/nvim.configlink/init.lua
index c42adbd..55ee97c 100644
--- a/nvim.configlink/init.lua
+++ b/nvim.configlink/init.lua
@@ -138,10 +138,7 @@ require("packer").startup(function(use)
             require("lspconfig").rust_analyzer.setup({ capabilities = capabilities })
             require("lspconfig").tflint.setup({ capabilities = capabilities })
             require("lspconfig").terraformls.setup({ capabilities = capabilities })
-            -- require("lspconfig").pyright.setup({
-            --     cmd = { "poetry", "run", "pyright-langserver", "--stdio" },
-            --     capabilities = capabilities,
-            -- })
+            require("lspconfig").pyright.setup({ capabilities = capabilities })
         end,
     })
 
@@ -160,10 +157,7 @@ require("packer").startup(function(use)
             require("null-ls").setup({
                 sources = {
                     require("null-ls").builtins.formatting.stylua,
-                    -- require("null-ls").builtins.formatting.black.with({
-                    --     command = "poetry",
-                    --     args = { "run", "black", "--quiet", "--fast", "-" },
-                    -- }),
+                    require("null-ls").builtins.formatting.black,
                     require("null-ls").builtins.formatting.fish_indent,
                     require("null-ls").builtins.formatting.nixfmt,
                     require("null-ls").builtins.formatting.rustfmt,
diff --git a/starship/starship.toml.configlink b/starship/starship.toml.configlink
index 5caed9d..ba83599 100644
--- a/starship/starship.toml.configlink
+++ b/starship/starship.toml.configlink
@@ -5,6 +5,7 @@ format = """\
   $git_branch\
   $git_commit\
   $git_status\
+  $python\
   $character\
   """