about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorDavid Morgan <djm_uk@protonmail.com>2024-10-03 12:18:31 +0100
committerDavid Morgan <djm_uk@protonmail.com>2024-10-03 12:18:31 +0100
commit8173d5f6945f28da28404dcc1b989c7f2f933555 (patch)
treeb550ff0f31cee051bf88fd8d3056eec8e17bf9b3
parentdc8b63e1eae0e8bb66fcfd28e9d7c31d09383126 (diff)
downloaddotfiles-8173d5f6945f28da28404dcc1b989c7f2f933555.tar.gz
Use zscaler cert for clojure
-rw-r--r--nix-conf/home/includes/clojure.nix5
-rw-r--r--nix-conf/home/otm.nix2
2 files changed, 5 insertions, 2 deletions
diff --git a/nix-conf/home/includes/clojure.nix b/nix-conf/home/includes/clojure.nix
index 85bd261..a942a90 100644
--- a/nix-conf/home/includes/clojure.nix
+++ b/nix-conf/home/includes/clojure.nix
@@ -13,11 +13,12 @@ in
     [
       babashka
       clj-kondo
-      clojure
       clojure-lsp
       jet
       maven
       neil
     ]
-    ++ optionals stdenv.isLinux [ leiningen ];
+    # TODO these are here because of the custom versions in otm.nix
+    # but there should be a better way
+    ++ optionals stdenv.isLinux [ leiningen clojure ];
 }
diff --git a/nix-conf/home/otm.nix b/nix-conf/home/otm.nix
index 67dab1e..df85b9a 100644
--- a/nix-conf/home/otm.nix
+++ b/nix-conf/home/otm.nix
@@ -113,6 +113,7 @@ let
   });
 
   zscaler-lein = pkgs.leiningen.override { jdk = zscaler-jdk; };
+  zscaler-clojure = pkgs.clojure.override { jdk = zscaler-jdk; };
 
   toggle = pkgs.writeShellScriptBin "remote-toggle" ''
     ssh -nT pi "playerctl play-pause" 2>/dev/null
@@ -151,6 +152,7 @@ in
   };
 
   home.packages = with pkgs; [
+    zscaler-clojure
     zscaler-lein
     toggle
   ];