From a50b10c05a0f819589344d50f221c0f1b9bf0b90 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Sat, 28 Oct 2023 09:18:46 -0400
Subject: [PATCH] Add python310 pip and virtualenv

---
 nix/base-system/flake.nix |  6 +++++-
 nix/base-system/init.lua  | 12 ++++++++++++
 nix/darwin/flake.lock     |  6 +++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index fab7c0d..bdfac72 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -136,6 +136,7 @@ EOF";
         };
         environment.systemPackages = (with pkgs; [
             terraform # TODO(jeremy): Replace with opentofu when that is an option.
+            terraform-ls
             postgresql
             oha
             nodejs
@@ -144,7 +145,9 @@ EOF";
             gnumake
             # TODO find a version of the julia package that will install
             # on darwin and add it as an overlay
-            python3
+            python310
+            python310Packages.pip
+            python310Packages.vritualenv
             emacs
             git
             mercurial
@@ -168,6 +171,7 @@ EOF";
             rlwrap
             docker-client
             google-cloud-sdk
+            awscli2
             nil-pkg
             alloy6
             omnisharp-roslyn
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index 44248da..31e1c44 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -11,7 +11,11 @@ vim.opt.paste = false
 vim.opt.autoindent = true
 vim.opt.linebreak = true
 vim.opt.mouse = ""
+-- neovim tabstop and shift behavior got more complicated.
+-- This should cover all the cases though
 vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
+--vim.opt.smarttab = false
 
 vim.g.BASH_AuthorName = 'Jeremy Wall'
 vim.g.BASH_AuthorRef = 'jw'
@@ -36,6 +40,10 @@ vim.cmd([[
 au BufNewFile,BufRead *.app set filetype=erlang
 ]])
 
+vim.cmd([[
+au BufNewFile,BufRead *.tf set filetype=terraform
+]])
+
 vim.cmd([[
 au BufNewFile,BufRead .bash_* set filetype=sh
 ]])
@@ -110,6 +118,9 @@ local caps = vim.tbl_deep_extend(
 );
 local lspconfig = require("lspconfig")
 
+-- Terraform lsp setup
+lspconfig.terraformls.setup{}
+
 -- Nix language server support
 lspconfig.nil_ls.setup{
     --single_file_support = true,
@@ -281,6 +292,7 @@ autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
 ]])
 
 -- Treesitter Plugin Setup 
+
 require('nvim-treesitter.configs').setup {
   highlight = {
     enable = true,
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index 67efc5a..3ba945f 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -36,12 +36,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-zVAgh0D4HCh+dWzci0xqqYpQsXgahZ08vsV8xaXERyk=",
-        "path": "/nix/store/gm1v6s4s2qaps6sc9nbj4lz92495djin-source/nix/base-system",
+        "narHash": "sha256-V6nZiN2UUJuPkB+sGCGoLTV3vSlKJpYM72WUOF+wBu4=",
+        "path": "/nix/store/xbfbv6krjgwi56whcdydwpbcxf4czscs-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/gm1v6s4s2qaps6sc9nbj4lz92495djin-source/nix/base-system",
+        "path": "/nix/store/xbfbv6krjgwi56whcdydwpbcxf4czscs-source/nix/base-system",
         "type": "path"
       }
     },