From f714401304dcf77a8fabd60e2693744ed3f3a588 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Sat, 31 Aug 2024 18:50:16 -0700
Subject: hi

---
 home/ebisu/fortune/development/database.nix        |  7 ++++
 .../ebisu/fortune/development/database/default.nix |  7 ----
 home/ebisu/fortune/development/default.nix         |  8 ++--
 home/ebisu/fortune/development/git.nix             | 10 +++++
 home/ebisu/fortune/development/git/default.nix     |  9 -----
 home/ebisu/fortune/development/infrastructure.nix  |  7 ++++
 .../fortune/development/infrastructure/default.nix |  7 ----
 .../fortune/development/languages/agnostic.nix     |  6 +++
 .../development/languages/agnostic/default.nix     |  6 ---
 .../fortune/development/languages/assembly.nix     |  8 ++++
 .../development/languages/assembly/default.nix     |  7 ----
 home/ebisu/fortune/development/languages/cobol.nix |  1 +
 .../development/languages/cobol/default.nix        |  5 ---
 .../fortune/development/languages/crystal.nix      |  7 ++++
 .../development/languages/crystal/default.nix      |  6 ---
 .../development/languages/csharp/default.nix       |  5 ---
 .../fortune/development/languages/default.nix      | 43 +++++++++++-----------
 .../ebisu/fortune/development/languages/dotnet.nix |  6 +++
 home/ebisu/fortune/development/languages/gleam.nix |  7 ++++
 .../development/languages/gleam/default.nix        |  7 ----
 home/ebisu/fortune/development/languages/go.nix    |  4 ++
 .../fortune/development/languages/go/default.nix   |  7 ----
 home/ebisu/fortune/development/languages/hare.nix  |  1 +
 .../fortune/development/languages/hare/default.nix |  5 ---
 .../fortune/development/languages/haskell.nix      |  8 ++++
 .../development/languages/haskell/default.nix      |  8 ----
 .../fortune/development/languages/javascript.nix   |  8 ++++
 .../development/languages/javascript/default.nix   |  9 -----
 home/ebisu/fortune/development/languages/jvm.nix   |  6 +++
 .../fortune/development/languages/jvm/default.nix  |  6 ---
 home/ebisu/fortune/development/languages/nim.nix   |  7 ++++
 .../fortune/development/languages/nim/default.nix  |  7 ----
 .../development/languages/other/default.nix        |  7 ----
 .../fortune/development/languages/protobuf.nix     |  1 +
 .../development/languages/protobuf/default.nix     |  5 ---
 .../ebisu/fortune/development/languages/python.nix |  9 +++++
 .../development/languages/python/default.nix       | 10 -----
 home/ebisu/fortune/development/languages/rust.nix  | 11 ++++++
 .../fortune/development/languages/rust/default.nix | 11 ------
 home/ebisu/fortune/development/languages/shell.nix |  7 ++++
 .../development/languages/shell/default.nix        |  5 ---
 home/ebisu/fortune/development/languages/tex.nix   |  1 +
 .../fortune/development/languages/tex/default.nix  |  5 ---
 home/ebisu/fortune/development/languages/vlang.nix |  1 +
 .../development/languages/vlang/default.nix        |  5 ---
 home/ebisu/fortune/development/languages/yaml.nix  |  1 +
 .../fortune/development/languages/yaml/default.nix |  5 ---
 home/ebisu/fortune/development/languages/zig.nix   | 14 +++++++
 .../fortune/development/languages/zig/default.nix  |  9 -----
 .../development/languages/zig/zls/default.nix      | 12 ------
 home/ebisu/fortune/development/nix.nix             | 23 ++++++++++++
 home/ebisu/fortune/development/nix/default.nix     | 24 ------------
 home/ebisu/fortune/development/tools/build.nix     | 10 +++++
 .../fortune/development/tools/build/default.nix    | 10 -----
 home/ebisu/fortune/development/tools/default.nix   |  3 +-
 55 files changed, 197 insertions(+), 237 deletions(-)
 create mode 100644 home/ebisu/fortune/development/database.nix
 delete mode 100644 home/ebisu/fortune/development/database/default.nix
 create mode 100644 home/ebisu/fortune/development/git.nix
 delete mode 100644 home/ebisu/fortune/development/git/default.nix
 create mode 100644 home/ebisu/fortune/development/infrastructure.nix
 delete mode 100644 home/ebisu/fortune/development/infrastructure/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/agnostic.nix
 delete mode 100644 home/ebisu/fortune/development/languages/agnostic/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/assembly.nix
 delete mode 100644 home/ebisu/fortune/development/languages/assembly/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/cobol.nix
 delete mode 100644 home/ebisu/fortune/development/languages/cobol/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/crystal.nix
 delete mode 100644 home/ebisu/fortune/development/languages/crystal/default.nix
 delete mode 100644 home/ebisu/fortune/development/languages/csharp/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/dotnet.nix
 create mode 100644 home/ebisu/fortune/development/languages/gleam.nix
 delete mode 100644 home/ebisu/fortune/development/languages/gleam/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/go.nix
 delete mode 100644 home/ebisu/fortune/development/languages/go/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/hare.nix
 delete mode 100644 home/ebisu/fortune/development/languages/hare/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/haskell.nix
 delete mode 100644 home/ebisu/fortune/development/languages/haskell/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/javascript.nix
 delete mode 100644 home/ebisu/fortune/development/languages/javascript/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/jvm.nix
 delete mode 100644 home/ebisu/fortune/development/languages/jvm/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/nim.nix
 delete mode 100644 home/ebisu/fortune/development/languages/nim/default.nix
 delete mode 100644 home/ebisu/fortune/development/languages/other/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/protobuf.nix
 delete mode 100644 home/ebisu/fortune/development/languages/protobuf/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/python.nix
 delete mode 100644 home/ebisu/fortune/development/languages/python/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/rust.nix
 delete mode 100644 home/ebisu/fortune/development/languages/rust/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/shell.nix
 delete mode 100644 home/ebisu/fortune/development/languages/shell/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/tex.nix
 delete mode 100644 home/ebisu/fortune/development/languages/tex/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/vlang.nix
 delete mode 100644 home/ebisu/fortune/development/languages/vlang/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/yaml.nix
 delete mode 100644 home/ebisu/fortune/development/languages/yaml/default.nix
 create mode 100644 home/ebisu/fortune/development/languages/zig.nix
 delete mode 100644 home/ebisu/fortune/development/languages/zig/default.nix
 delete mode 100644 home/ebisu/fortune/development/languages/zig/zls/default.nix
 create mode 100644 home/ebisu/fortune/development/nix.nix
 delete mode 100644 home/ebisu/fortune/development/nix/default.nix
 create mode 100644 home/ebisu/fortune/development/tools/build.nix
 delete mode 100644 home/ebisu/fortune/development/tools/build/default.nix

diff --git a/home/ebisu/fortune/development/database.nix b/home/ebisu/fortune/development/database.nix
new file mode 100644
index 0000000..a9782a1
--- /dev/null
+++ b/home/ebisu/fortune/development/database.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    diesel-cli
+    redis
+    sqlite
+  ];
+}
diff --git a/home/ebisu/fortune/development/database/default.nix b/home/ebisu/fortune/development/database/default.nix
deleted file mode 100644
index a9782a1..0000000
--- a/home/ebisu/fortune/development/database/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    diesel-cli
-    redis
-    sqlite
-  ];
-}
diff --git a/home/ebisu/fortune/development/default.nix b/home/ebisu/fortune/development/default.nix
index e033d0c..52cc853 100644
--- a/home/ebisu/fortune/development/default.nix
+++ b/home/ebisu/fortune/development/default.nix
@@ -1,10 +1,10 @@
 {
   imports = [
-    ./database
-    ./git
-    ./infrastructure
     ./languages
-    ./nix
     ./tools
+    ./database.nix
+    ./git.nix
+    ./infrastructure.nix
+    ./nix.nix
   ];
 }
diff --git a/home/ebisu/fortune/development/git.nix b/home/ebisu/fortune/development/git.nix
new file mode 100644
index 0000000..7408203
--- /dev/null
+++ b/home/ebisu/fortune/development/git.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    delta
+    gh
+    onefetch
+    gitoxide
+    (callPackage ../../../../pkgs/git-sumi.nix { })
+  ];
+}
diff --git a/home/ebisu/fortune/development/git/default.nix b/home/ebisu/fortune/development/git/default.nix
deleted file mode 100644
index 9019328..0000000
--- a/home/ebisu/fortune/development/git/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    delta
-    gh
-    onefetch
-    gitoxide
-    (callPackage ../../../../../pkgs/git-sumi.nix { })
-  ];
-}
diff --git a/home/ebisu/fortune/development/infrastructure.nix b/home/ebisu/fortune/development/infrastructure.nix
new file mode 100644
index 0000000..7f43f0b
--- /dev/null
+++ b/home/ebisu/fortune/development/infrastructure.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    flyctl
+    nodePackages_latest.wrangler
+    nodePackages_latest.vercel
+  ];
+}
diff --git a/home/ebisu/fortune/development/infrastructure/default.nix b/home/ebisu/fortune/development/infrastructure/default.nix
deleted file mode 100644
index 7f43f0b..0000000
--- a/home/ebisu/fortune/development/infrastructure/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    flyctl
-    nodePackages_latest.wrangler
-    nodePackages_latest.vercel
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/agnostic.nix b/home/ebisu/fortune/development/languages/agnostic.nix
new file mode 100644
index 0000000..e726fae
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/agnostic.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    clang
+    mold
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/agnostic/default.nix b/home/ebisu/fortune/development/languages/agnostic/default.nix
deleted file mode 100644
index e726fae..0000000
--- a/home/ebisu/fortune/development/languages/agnostic/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    clang
-    mold
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/assembly.nix b/home/ebisu/fortune/development/languages/assembly.nix
new file mode 100644
index 0000000..ec21e8e
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/assembly.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    nasm
+    nasmfmt
+    yasm
+    # uxn
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/assembly/default.nix b/home/ebisu/fortune/development/languages/assembly/default.nix
deleted file mode 100644
index b593a41..0000000
--- a/home/ebisu/fortune/development/languages/assembly/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    nasm
-    # nasmfmt
-    yasm
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/cobol.nix b/home/ebisu/fortune/development/languages/cobol.nix
new file mode 100644
index 0000000..cb84d30
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/cobol.nix
@@ -0,0 +1 @@
+{ pkgs, ... }: { home.packages = with pkgs; [ gnu-cobol ]; }
diff --git a/home/ebisu/fortune/development/languages/cobol/default.nix b/home/ebisu/fortune/development/languages/cobol/default.nix
deleted file mode 100644
index 82e5464..0000000
--- a/home/ebisu/fortune/development/languages/cobol/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    gnu-cobol
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/crystal.nix b/home/ebisu/fortune/development/languages/crystal.nix
new file mode 100644
index 0000000..aa7a8ed
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/crystal.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    ameba
+    crystal
+    shards
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/crystal/default.nix b/home/ebisu/fortune/development/languages/crystal/default.nix
deleted file mode 100644
index 51a0846..0000000
--- a/home/ebisu/fortune/development/languages/crystal/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    crystal
-    shards
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/csharp/default.nix b/home/ebisu/fortune/development/languages/csharp/default.nix
deleted file mode 100644
index b8f8285..0000000
--- a/home/ebisu/fortune/development/languages/csharp/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    dotnetCorePackages.dotnet_9.sdk
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/default.nix b/home/ebisu/fortune/development/languages/default.nix
index 05cfd95..963880e 100644
--- a/home/ebisu/fortune/development/languages/default.nix
+++ b/home/ebisu/fortune/development/languages/default.nix
@@ -1,25 +1,24 @@
-_: {
+{
   imports = [
-    ./agnostic
-    # ./assembly
-    ./cobol
-    ./crystal
-    # ./csharp
-    ./gleam
-    ./go
-    # ./hare
-    ./haskell
-    ./javascript
-    ./jvm
-    ./nim
-    ./other
-    ./protobuf
-    ./python
-    ./rust
-    # ./shell
-    ./tex
-    # ./vlang
-    ./yaml
-    ./zig
+    ./agnostic.nix
+    # ./assembly.nix
+    # ./cobol.nix
+    # ./crystal.nix
+    ./dotnet.nix
+    ./gleam.nix
+    ./go.nix
+    # ./hare.nix
+    ./haskell.nix
+    ./javascript.nix
+    # ./jvm.nix
+    # ./nim.nix
+    ./protobuf.nix
+    ./python.nix
+    ./rust.nix
+    # ./shell.nix
+    ./tex.nix
+    # ./vlang.nix
+    ./yaml.nix
+    ./zig.nix
   ];
 }
diff --git a/home/ebisu/fortune/development/languages/dotnet.nix b/home/ebisu/fortune/development/languages/dotnet.nix
new file mode 100644
index 0000000..d3d60b4
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/dotnet.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    dotnetCorePackages.dotnet_9.sdk
+    dotnetCorePackages.dotnet_9.runtime
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/gleam.nix b/home/ebisu/fortune/development/languages/gleam.nix
new file mode 100644
index 0000000..421c21a
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/gleam.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    erlang_nox
+    gleam
+    rebar3
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/gleam/default.nix b/home/ebisu/fortune/development/languages/gleam/default.nix
deleted file mode 100644
index de1ab92..0000000
--- a/home/ebisu/fortune/development/languages/gleam/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    gleam
-    rebar3
-    erlang_nox
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/go.nix b/home/ebisu/fortune/development/languages/go.nix
new file mode 100644
index 0000000..d7ca20f
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/go.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }: {
+  programs.go.enable = true;
+  home.packages = with pkgs; [ gopls ];
+}
diff --git a/home/ebisu/fortune/development/languages/go/default.nix b/home/ebisu/fortune/development/languages/go/default.nix
deleted file mode 100644
index a248efd..0000000
--- a/home/ebisu/fortune/development/languages/go/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  programs.go.enable = true;
-
-  home.packages = with pkgs; [
-    gopls
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/hare.nix b/home/ebisu/fortune/development/languages/hare.nix
new file mode 100644
index 0000000..1cd3cbf
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/hare.nix
@@ -0,0 +1 @@
+{ pkgs, ... }: { home.packages = with pkgs; [ hare ]; }
diff --git a/home/ebisu/fortune/development/languages/hare/default.nix b/home/ebisu/fortune/development/languages/hare/default.nix
deleted file mode 100644
index 79fc13b..0000000
--- a/home/ebisu/fortune/development/languages/hare/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    hare
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/haskell.nix b/home/ebisu/fortune/development/languages/haskell.nix
new file mode 100644
index 0000000..f9a17ce
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/haskell.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    ghc
+    haskellPackages.cabal-fmt
+    # haskellPackages.pier
+    stack
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/haskell/default.nix b/home/ebisu/fortune/development/languages/haskell/default.nix
deleted file mode 100644
index f9a17ce..0000000
--- a/home/ebisu/fortune/development/languages/haskell/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    ghc
-    haskellPackages.cabal-fmt
-    # haskellPackages.pier
-    stack
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/javascript.nix b/home/ebisu/fortune/development/languages/javascript.nix
new file mode 100644
index 0000000..cf14f25
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/javascript.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    bun
+    # deno
+    nodePackages_latest.nodejs
+    yarn-berry
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/javascript/default.nix b/home/ebisu/fortune/development/languages/javascript/default.nix
deleted file mode 100644
index 26b320d..0000000
--- a/home/ebisu/fortune/development/languages/javascript/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    bun
-    # deno
-    nodePackages_latest.nodejs
-    # typescript
-    yarn-berry
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/jvm.nix b/home/ebisu/fortune/development/languages/jvm.nix
new file mode 100644
index 0000000..c519352
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/jvm.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    kotlin
+    cfr
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/jvm/default.nix b/home/ebisu/fortune/development/languages/jvm/default.nix
deleted file mode 100644
index 86f9708..0000000
--- a/home/ebisu/fortune/development/languages/jvm/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    # kotlin
-    cfr
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/nim.nix b/home/ebisu/fortune/development/languages/nim.nix
new file mode 100644
index 0000000..4dcb2cf
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/nim.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    nim
+    nimble
+    nimlangserver
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/nim/default.nix b/home/ebisu/fortune/development/languages/nim/default.nix
deleted file mode 100644
index 4dcb2cf..0000000
--- a/home/ebisu/fortune/development/languages/nim/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    nim
-    nimble
-    nimlangserver
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/other/default.nix b/home/ebisu/fortune/development/languages/other/default.nix
deleted file mode 100644
index a0c7eb0..0000000
--- a/home/ebisu/fortune/development/languages/other/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs
-, ...
-}: {
-  home.packages = with pkgs; [
-    uxn
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/protobuf.nix b/home/ebisu/fortune/development/languages/protobuf.nix
new file mode 100644
index 0000000..0391f07
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/protobuf.nix
@@ -0,0 +1 @@
+{ pkgs, ... }: { home.packages = with pkgs; [ protobuf ]; }
diff --git a/home/ebisu/fortune/development/languages/protobuf/default.nix b/home/ebisu/fortune/development/languages/protobuf/default.nix
deleted file mode 100644
index 21dd9f7..0000000
--- a/home/ebisu/fortune/development/languages/protobuf/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    protobuf
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/python.nix b/home/ebisu/fortune/development/languages/python.nix
new file mode 100644
index 0000000..f970f71
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/python.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    python3
+    rye
+    mypy
+    black
+    uv
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/python/default.nix b/home/ebisu/fortune/development/languages/python/default.nix
deleted file mode 100644
index 34112a2..0000000
--- a/home/ebisu/fortune/development/languages/python/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    python312
-    rye
-    mypy
-    black
-  ];
-
-  programs.poetry.enable = true;
-}
diff --git a/home/ebisu/fortune/development/languages/rust.nix b/home/ebisu/fortune/development/languages/rust.nix
new file mode 100644
index 0000000..5d27188
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/rust.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    cargo-outdated
+    cargo-watch
+    cargo-make
+    cargo-cache
+    rustup
+    cargo-udeps
+    (callPackage ../../../../../pkgs/cargo-clean-all.nix { })
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/rust/default.nix b/home/ebisu/fortune/development/languages/rust/default.nix
deleted file mode 100644
index 4fe9b6c..0000000
--- a/home/ebisu/fortune/development/languages/rust/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    cargo-outdated
-    cargo-watch
-    cargo-make
-    cargo-cache
-    rustup
-    cargo-udeps
-    (callPackage ../../../../../../pkgs/cargo-clean-all.nix { })
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/shell.nix b/home/ebisu/fortune/development/languages/shell.nix
new file mode 100644
index 0000000..a47a2cc
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/shell.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    amber-lang
+    shfmt
+  ];
+}
diff --git a/home/ebisu/fortune/development/languages/shell/default.nix b/home/ebisu/fortune/development/languages/shell/default.nix
deleted file mode 100644
index 6476dca..0000000
--- a/home/ebisu/fortune/development/languages/shell/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    amber-lang
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/tex.nix b/home/ebisu/fortune/development/languages/tex.nix
new file mode 100644
index 0000000..f79521f
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/tex.nix
@@ -0,0 +1 @@
+{ pkgs, ... }: { home.packages = with pkgs; [ tectonic ]; }
diff --git a/home/ebisu/fortune/development/languages/tex/default.nix b/home/ebisu/fortune/development/languages/tex/default.nix
deleted file mode 100644
index 0b88179..0000000
--- a/home/ebisu/fortune/development/languages/tex/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    tectonic
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/vlang.nix b/home/ebisu/fortune/development/languages/vlang.nix
new file mode 100644
index 0000000..626e7cd
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/vlang.nix
@@ -0,0 +1 @@
+{ pkgs, ... }: { home.packages = with pkgs; [ vlang ]; }
diff --git a/home/ebisu/fortune/development/languages/vlang/default.nix b/home/ebisu/fortune/development/languages/vlang/default.nix
deleted file mode 100644
index d9da941..0000000
--- a/home/ebisu/fortune/development/languages/vlang/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    vlang
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/yaml.nix b/home/ebisu/fortune/development/languages/yaml.nix
new file mode 100644
index 0000000..feef34e
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/yaml.nix
@@ -0,0 +1 @@
+{ pkgs, ... }: { home.packages = with pkgs; [ yamllint ]; }
diff --git a/home/ebisu/fortune/development/languages/yaml/default.nix b/home/ebisu/fortune/development/languages/yaml/default.nix
deleted file mode 100644
index cd91d5e..0000000
--- a/home/ebisu/fortune/development/languages/yaml/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    yamllint
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/zig.nix b/home/ebisu/fortune/development/languages/zig.nix
new file mode 100644
index 0000000..4cb900b
--- /dev/null
+++ b/home/ebisu/fortune/development/languages/zig.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    zig
+    zls
+  ];
+
+  xdg.configFile."zls.json".text = ''
+    {
+      "enable_build_on_save": true,
+      "build_on_save_step": "check"
+    }
+  '';
+}
diff --git a/home/ebisu/fortune/development/languages/zig/default.nix b/home/ebisu/fortune/development/languages/zig/default.nix
deleted file mode 100644
index 98f1ad9..0000000
--- a/home/ebisu/fortune/development/languages/zig/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-  imports = [
-    ./zls
-  ];
-
-  home.packages = with pkgs; [
-    zig
-  ];
-}
diff --git a/home/ebisu/fortune/development/languages/zig/zls/default.nix b/home/ebisu/fortune/development/languages/zig/zls/default.nix
deleted file mode 100644
index 7aba4eb..0000000
--- a/home/ebisu/fortune/development/languages/zig/zls/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    zls
-  ];
-
-  xdg.configFile."zls.json".text = ''
-    {
-      "enable_build_on_save": true,
-      "build_on_save_step": "check"
-    }
-  '';
-}
diff --git a/home/ebisu/fortune/development/nix.nix b/home/ebisu/fortune/development/nix.nix
new file mode 100644
index 0000000..2c3f117
--- /dev/null
+++ b/home/ebisu/fortune/development/nix.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+{
+  programs.direnv.enable = true;
+
+  home.packages = with pkgs; [
+    nil
+    statix
+    alejandra
+    nurl
+    nix-init
+    nix-prefetch-git
+    nixfmt-rfc-style
+    nix-tree
+    nix-visualize
+    statix
+    deadnix
+    update-nix-fetchgit
+    nix-prefetch-scripts
+    nix-output-monitor
+    cachix
+    devenv
+  ];
+}
diff --git a/home/ebisu/fortune/development/nix/default.nix b/home/ebisu/fortune/development/nix/default.nix
deleted file mode 100644
index 63c21e5..0000000
--- a/home/ebisu/fortune/development/nix/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.direnv.enable = true;
-
-  home.packages = with pkgs; [
-    nil
-    statix
-    alejandra
-    nurl
-    nix-init
-    nix-prefetch-git
-    nixpkgs-fmt
-    nixfmt-rfc-style
-    nix-tree
-    nix-visualize
-    statix
-    deadnix
-    update-nix-fetchgit
-    nix-prefetch-scripts
-    nix-output-monitor
-    cachix
-    devenv
-  ];
-}
diff --git a/home/ebisu/fortune/development/tools/build.nix b/home/ebisu/fortune/development/tools/build.nix
new file mode 100644
index 0000000..6dff41a
--- /dev/null
+++ b/home/ebisu/fortune/development/tools/build.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    cmake
+    just
+    tup
+    meson
+    ninja
+    sccache
+  ];
+}
diff --git a/home/ebisu/fortune/development/tools/build/default.nix b/home/ebisu/fortune/development/tools/build/default.nix
deleted file mode 100644
index 6dff41a..0000000
--- a/home/ebisu/fortune/development/tools/build/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    cmake
-    just
-    tup
-    meson
-    ninja
-    sccache
-  ];
-}
diff --git a/home/ebisu/fortune/development/tools/default.nix b/home/ebisu/fortune/development/tools/default.nix
index aca8fde..b365ffe 100644
--- a/home/ebisu/fortune/development/tools/default.nix
+++ b/home/ebisu/fortune/development/tools/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  imports = [ ./build ];
+  imports = [ ./build.nix ];
 
   home.packages = with pkgs; [
     clang-tools
@@ -8,7 +8,6 @@
     highlight
     hyperfine
     sloc
-    shfmt
     wakatime-cli
     linuxKernel.packages.linux_lqx.perf
     radare2
-- 
cgit v1.2.3