i

7 files changed, 40 insertions, 4 deletions

diff --git a/home/ebisu/fortune/development/languages/ada.nix b/home/ebisu/fortune/development/languages/ada.nix
new file mode 100644
index 0000000..00b88bf
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/ada.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = [ pkgs.alire ];
+}
diff --git a/home/ebisu/fortune/development/languages/default.nix b/home/ebisu/fortune/development/languages/default.nix
index 963880e..383906e 100644
--- a/home/ebisu/fortune/development/languages/default.nix
+++ b/home/ebisu/fortune/development/languages/default.nix
@@ -1,5 +1,7 @@
 {
   imports = [
+    # ./jvm
+    # ./ada.nix
     ./agnostic.nix
     # ./assembly.nix
     # ./cobol.nix
@@ -10,7 +12,7 @@
     # ./hare.nix
     ./haskell.nix
     ./javascript.nix
-    # ./jvm.nix
+    ./lisp.nix
     # ./nim.nix
     ./protobuf.nix
     ./python.nix
diff --git a/home/ebisu/fortune/development/languages/jvm/clojure.nix b/home/ebisu/fortune/development/languages/jvm/clojure.nix
new file mode 100644
index 0000000..c796cd9
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/jvm/clojure.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    babashka
+    cljfmt
+    clojure
+    leiningen
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/jvm/default.nix b/home/ebisu/fortune/development/languages/jvm/default.nix
new file mode 100644
index 0000000..7e8e9bc
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/jvm/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./clojure.nix
+    ./scala.nix
+  ];
+
+  home.packages = with pkgs; [
+    kotlin
+    cfr
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/jvm/scala.nix b/home/ebisu/fortune/development/languages/jvm/scala.nix
new file mode 100644
index 0000000..b116274
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/jvm/scala.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    scala
+    sbt
+    scalafmt
+    scalafix
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/jvm.nix b/home/ebisu/fortune/development/languages/lisp.nix
index 6461e4b..af039fa 100644
--- a/home/ebisu/fortune/development/languages/jvm.nix
+++ b/home/ebisu/fortune/development/languages/lisp.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    kotlin
-    cfr
+    sbcl
+    racket
   ];
 }
diff --git a/home/ebisu/fortune/multimedia/browser/default.nix b/home/ebisu/fortune/multimedia/browser/default.nix
index a720f52..8a4cfc2 100644
--- a/home/ebisu/fortune/multimedia/browser/default.nix
+++ b/home/ebisu/fortune/multimedia/browser/default.nix
@@ -10,7 +10,7 @@
     # vieb
     # ladybird
     web-ext
-    tor-browser
+    tor-browser-bundle-bin
     (pkgs.callPackage ../../../../../pkgs/zen-browser-bin.nix { })
   ];
 }