From ba6a4e3694fb330dac6712730fd639410e4e557c Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 18 Aug 2023 13:16:23 -0500
Subject: [PATCH] Updating editor

---
 darwin/work/default.nix |  1 +
 flake.lock              |  6 +++---
 home/vim.nix            | 39 +--------------------------------------
 home/xonsh.nix          |  2 +-
 4 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/darwin/work/default.nix b/darwin/work/default.nix
index 6cf2e8d..7b5442c 100644
--- a/darwin/work/default.nix
+++ b/darwin/work/default.nix
@@ -13,4 +13,5 @@
 			"vagrant"
 		];
 	};
+	environment.loginShell = "${pkgs.xonsh}/bin/xonsh";
 }
diff --git a/flake.lock b/flake.lock
index e43165c..6142626 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689516967,
-        "narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=",
+        "lastModified": 1692248770,
+        "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "61662a63bfe1726588c1da6b412df86d8ca94d63",
+        "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
         "type": "github"
       },
       "original": {
diff --git a/home/vim.nix b/home/vim.nix
index 1546038..4d4c685 100644
--- a/home/vim.nix
+++ b/home/vim.nix
@@ -27,43 +27,6 @@ in
 		pyright
 	];
 
-	#programs.neovim = {
-	#	enable = true;
-	#	viAlias = true;
-	#	vimAlias = true;
-	#	vimdiffAlias = true;
-	#	plugins = with pkgs.vimPlugins; [
-	#		ansible-vim
-	#		bufexplorer
-#
-#			#cmp-nvim-lsp
-#			#cmp-vsnip
-#			#nvim-lspconfig
-#			nvim-cmp
-#
-#			jedi-vim
-#
-#			context-vim
-#			direnv-vim
-#			fzf-vim
-#			nerdtree
-#			nvim-notify
-#			vim-airline
-#			vim-gitgutter
-#			vim-flake8
-#			vim-fugitive
-#			vim-indent-guides
-#			vim-packer
-#			vim-rooter
-#			vim-xonsh
-#			gruvbox
-#		];
-#		extraLuaConfig = builtins.readFile ./init.lua;
-#		coc = {
-#			# Currently waiting on resolution of https://github.com/NixOS/nixpkgs/issues/236560
-#			enable = false;
-#		};
-#	};
 	programs.nixneovim = {
 		enable = true;
 		colorscheme = "gruvbox";
@@ -135,7 +98,7 @@ in
 			nerdtree
 			nvim-cmp
 
-			jedi-vim
+			#jedi-vim
 
 			context-vim
 			direnv-vim
diff --git a/home/xonsh.nix b/home/xonsh.nix
index 51d875c..029a3da 100644
--- a/home/xonsh.nix
+++ b/home/xonsh.nix
@@ -37,7 +37,7 @@
 			cci = "./scripts/circleci-checks.py";
 			cgh = "$GH_CONFIG_DIR=\"${config.home.homeDirectory}/.config/gh/compass\" gh";
 			crun = "compass workspace run";
-			ctest = "compass workspace test";
+			ctest = "compass workspace test --extra-cmd-args=\"--test_output=errors\"";
 			cylint = "./scripts/run_yaml_lint.py";
 			cpip = "compass workspace run src/python3/uc/tools:run_pip_compile";