hi

36 files changed, 51 insertions, 91 deletions

diff --git a/home/ebisu/fortune/development/database/default.nix b/home/ebisu/fortune/development/database.nix
index a9782a1..a9782a1 100644
--- a/home/ebisu/fortune/development/database/default.nix
+++ b/home/ebisu/fortune/development/database.nix
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/default.nix b/home/ebisu/fortune/development/git.nix
index 9019328..7408203 100644
--- a/home/ebisu/fortune/development/git/default.nix
+++ b/home/ebisu/fortune/development/git.nix
@@ -1,9 +1,10 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     delta
     gh
     onefetch
     gitoxide
-    (callPackage ../../../../../pkgs/git-sumi.nix { })
+    (callPackage ../../../../pkgs/git-sumi.nix { })
   ];
 }
diff --git a/home/ebisu/fortune/development/infrastructure/default.nix b/home/ebisu/fortune/development/infrastructure.nix
index 7f43f0b..7f43f0b 100644
--- a/home/ebisu/fortune/development/infrastructure/default.nix
+++ b/home/ebisu/fortune/development/infrastructure.nix
diff --git a/home/ebisu/fortune/development/languages/agnostic/default.nix b/home/ebisu/fortune/development/languages/agnostic.nix
index e726fae..e726fae 100644
--- a/home/ebisu/fortune/development/languages/agnostic/default.nix
+++ b/home/ebisu/fortune/development/languages/agnostic.nix
diff --git a/home/ebisu/fortune/development/languages/assembly/default.nix b/home/ebisu/fortune/development/languages/assembly.nix
index b593a41..ec21e8e 100644
--- a/home/ebisu/fortune/development/languages/assembly/default.nix
+++ b/home/ebisu/fortune/development/languages/assembly.nix
@@ -1,7 +1,8 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
     nasm
-    # nasmfmt
+    nasmfmt
     yasm
+    # uxn
   ];
 }
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/default.nix b/home/ebisu/fortune/development/languages/crystal.nix
index 51a0846..aa7a8ed 100644
--- a/home/ebisu/fortune/development/languages/crystal/default.nix
+++ b/home/ebisu/fortune/development/languages/crystal.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
+    ameba
     crystal
     shards
   ];
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/csharp/default.nix b/home/ebisu/fortune/development/languages/dotnet.nix
index b8f8285..d3d60b4 100644
--- a/home/ebisu/fortune/development/languages/csharp/default.nix
+++ b/home/ebisu/fortune/development/languages/dotnet.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
     dotnetCorePackages.dotnet_9.sdk
+    dotnetCorePackages.dotnet_9.runtime
   ];
 }
diff --git a/home/ebisu/fortune/development/languages/gleam/default.nix b/home/ebisu/fortune/development/languages/gleam.nix
index de1ab92..421c21a 100644
--- a/home/ebisu/fortune/development/languages/gleam/default.nix
+++ b/home/ebisu/fortune/development/languages/gleam.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
+    erlang_nox
     gleam
     rebar3
-    erlang_nox
   ];
 }
diff --git a/home/ebisu/fortune/development/languages/go/default.nix b/home/ebisu/fortune/development/languages/go.nix
index a248efd..d7ca20f 100644
--- a/home/ebisu/fortune/development/languages/go/default.nix
+++ b/home/ebisu/fortune/development/languages/go.nix
@@ -1,7 +1,4 @@
 { pkgs, ... }: {
   programs.go.enable = true;
-
-  home.packages = with pkgs; [
-    gopls
-  ];
+  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/default.nix b/home/ebisu/fortune/development/languages/haskell.nix
index f9a17ce..f9a17ce 100644
--- a/home/ebisu/fortune/development/languages/haskell/default.nix
+++ b/home/ebisu/fortune/development/languages/haskell.nix
diff --git a/home/ebisu/fortune/development/languages/javascript/default.nix b/home/ebisu/fortune/development/languages/javascript.nix
index 26b320d..cf14f25 100644
--- a/home/ebisu/fortune/development/languages/javascript/default.nix
+++ b/home/ebisu/fortune/development/languages/javascript.nix
@@ -3,7 +3,6 @@
     bun
     # deno
     nodePackages_latest.nodejs
-    # typescript
     yarn-berry
   ];
 }
diff --git a/home/ebisu/fortune/development/languages/jvm/default.nix b/home/ebisu/fortune/development/languages/jvm.nix
index 86f9708..c519352 100644
--- a/home/ebisu/fortune/development/languages/jvm/default.nix
+++ b/home/ebisu/fortune/development/languages/jvm.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
-    # kotlin
+    kotlin
     cfr
   ];
 }
diff --git a/home/ebisu/fortune/development/languages/nim/default.nix b/home/ebisu/fortune/development/languages/nim.nix
index 4dcb2cf..4dcb2cf 100644
--- a/home/ebisu/fortune/development/languages/nim/default.nix
+++ b/home/ebisu/fortune/development/languages/nim.nix
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/default.nix b/home/ebisu/fortune/development/languages/python.nix
index 34112a2..f970f71 100644
--- a/home/ebisu/fortune/development/languages/python/default.nix
+++ b/home/ebisu/fortune/development/languages/python.nix
@@ -1,10 +1,9 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
-    python312
+    python3
     rye
     mypy
     black
+    uv
   ];
-
-  programs.poetry.enable = true;
 }
diff --git a/home/ebisu/fortune/development/languages/rust/default.nix b/home/ebisu/fortune/development/languages/rust.nix
index 4fe9b6c..5d27188 100644
--- a/home/ebisu/fortune/development/languages/rust/default.nix
+++ b/home/ebisu/fortune/development/languages/rust.nix
@@ -6,6 +6,6 @@
     cargo-cache
     rustup
     cargo-udeps
-    (callPackage ../../../../../../pkgs/cargo-clean-all.nix { })
+    (callPackage ../../../../../pkgs/cargo-clean-all.nix { })
   ];
 }
diff --git a/home/ebisu/fortune/development/languages/shell/default.nix b/home/ebisu/fortune/development/languages/shell.nix
index 6476dca..a47a2cc 100644
--- a/home/ebisu/fortune/development/languages/shell/default.nix
+++ b/home/ebisu/fortune/development/languages/shell.nix
@@ -1,5 +1,7 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     amber-lang
+    shfmt
   ];
 }
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/zls/default.nix b/home/ebisu/fortune/development/languages/zig.nix
index 7aba4eb..4cb900b 100644
--- a/home/ebisu/fortune/development/languages/zig/zls/default.nix
+++ b/home/ebisu/fortune/development/languages/zig.nix
@@ -1,5 +1,7 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
+    zig
     zls
   ];
 
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/nix/default.nix b/home/ebisu/fortune/development/nix.nix
index 63c21e5..2c3f117 100644
--- a/home/ebisu/fortune/development/nix/default.nix
+++ b/home/ebisu/fortune/development/nix.nix
@@ -9,7 +9,6 @@
     nurl
     nix-init
     nix-prefetch-git
-    nixpkgs-fmt
     nixfmt-rfc-style
     nix-tree
     nix-visualize
diff --git a/home/ebisu/fortune/development/tools/build/default.nix b/home/ebisu/fortune/development/tools/build.nix
index 6dff41a..6dff41a 100644
--- a/home/ebisu/fortune/development/tools/build/default.nix
+++ b/home/ebisu/fortune/development/tools/build.nix
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