From e085facc30503715dc088b0a0c065c9bd424ae1b Mon Sep 17 00:00:00 2001
From: Griffin Smith <root@gws.fyi>
Date: Thu, 7 May 2020 10:57:36 -0400
Subject: fix conflict with urbos

---
 home/modules/development/kube.nix | 2 +-
 home/modules/emacs.nix            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/home/modules/development/kube.nix b/home/modules/development/kube.nix
index 58de4b70ed00..916e1cd7a70d 100644
--- a/home/modules/development/kube.nix
+++ b/home/modules/development/kube.nix
@@ -25,7 +25,7 @@ in
     kubetail
     sops
     kubie
-    pkgs-unstable.argocd
+    # pkgs-unstable.argocd # provided by urbos
   ];
 
   programs.zsh.shellAliases = {
diff --git a/home/modules/emacs.nix b/home/modules/emacs.nix
index e7543eb1685d..80116312e945 100644
--- a/home/modules/emacs.nix
+++ b/home/modules/emacs.nix
@@ -8,7 +8,7 @@ let
  #                               # and packages.el files
  # };
 in {
-  imports = [ ./lib/cloneRepo.nix ];
+  # imports = [ ./lib/cloneRepo.nix ];
 
   # home.packages = [ doom-emacs ];
   # home.file.".emacs.d/init.el".text = ''
-- 
cgit 1.4.1