about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGriffin Smith <root@gws.fyi>2020-05-07T14·57-0400
committerGriffin Smith <root@gws.fyi>2020-05-07T14·57-0400
commite085facc30503715dc088b0a0c065c9bd424ae1b (patch)
treeed8038e44f7b28ffaf261d3ba3e4b6d37ab60189
parent28489a2141a6ab41285bd6a4f8259b4f621001c9 (diff)
fix conflict with urbos
-rw-r--r--home/modules/development/kube.nix2
-rw-r--r--home/modules/emacs.nix2
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 = ''