From daa04acce4828c5bc54209dbb28696951c5f2157 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Sun, 1 Sep 2024 22:30:52 -0700
Subject: i

---
 home/ebisu/fortune/development/languages/ada.nix         |  4 ++++
 home/ebisu/fortune/development/languages/default.nix     |  4 +++-
 home/ebisu/fortune/development/languages/jvm.nix         |  7 -------
 home/ebisu/fortune/development/languages/jvm/clojure.nix |  9 +++++++++
 home/ebisu/fortune/development/languages/jvm/default.nix | 12 ++++++++++++
 home/ebisu/fortune/development/languages/jvm/scala.nix   |  9 +++++++++
 home/ebisu/fortune/development/languages/lisp.nix        |  7 +++++++
 home/ebisu/fortune/multimedia/browser/default.nix        |  2 +-
 8 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 home/ebisu/fortune/development/languages/ada.nix
 delete mode 100644 home/ebisu/fortune/development/languages/jvm.nix
 create mode 100644 home/ebisu/fortune/development/languages/jvm/clojure.nix
 create mode 100644 home/ebisu/fortune/development/languages/jvm/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/jvm/scala.nix
 create mode 100644 home/ebisu/fortune/development/languages/lisp.nix

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.nix b/home/ebisu/fortune/development/languages/jvm.nix
deleted file mode 100644
index 6461e4b..0000000
--- a/home/ebisu/fortune/development/languages/jvm.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    kotlin
-    cfr
-  ];
-}
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/lisp.nix b/home/ebisu/fortune/development/languages/lisp.nix
new file mode 100644
index 0000000..af039fa
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/lisp.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    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 { })
   ];
 }
-- 
cgit v1.2.3