From 41c883ddad8f1af9468ff71db5f5144483c73668 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Mon, 8 Jul 2024 12:30:30 -0700
Subject: hi

---
 home/fuwn/meta/development/infrastructure/default.nix        | 8 ++++----
 home/fuwn/meta/development/infrastructure/docker/default.nix | 5 -----
 home/fuwn/meta/development/infrastructure/fly/default.nix    | 5 -----
 home/fuwn/meta/development/languages/agnostic/default.nix    | 4 +---
 home/fuwn/meta/development/languages/c/default.nix           | 5 -----
 home/fuwn/meta/development/languages/csharp/default.nix      | 5 +++++
 home/fuwn/meta/development/languages/default.nix             | 3 ++-
 home/fuwn/meta/development/languages/haskell/default.nix     | 5 +++++
 home/fuwn/meta/development/tools/build/default.nix           | 7 +++++++
 home/fuwn/meta/development/tools/database/default.nix        | 5 +++++
 home/fuwn/meta/development/tools/default.nix                 | 5 +++++
 home/fuwn/meta/filesystem/default.nix                        | 2 ++
 home/fuwn/meta/multimedia/audio/default.nix                  | 1 +
 home/fuwn/meta/multimedia/default.nix                        | 1 +
 home/fuwn/meta/system/default.nix                            | 1 +
 home/fuwn/meta/system/virtualisation/default.nix             | 9 +++++++++
 home/fuwn/meta/system/virtualisation/docker/default.nix      | 8 ++++++++
 17 files changed, 56 insertions(+), 23 deletions(-)
 delete mode 100644 home/fuwn/meta/development/infrastructure/docker/default.nix
 delete mode 100644 home/fuwn/meta/development/infrastructure/fly/default.nix
 delete mode 100644 home/fuwn/meta/development/languages/c/default.nix
 create mode 100644 home/fuwn/meta/development/languages/csharp/default.nix
 create mode 100644 home/fuwn/meta/development/languages/haskell/default.nix
 create mode 100644 home/fuwn/meta/development/tools/build/default.nix
 create mode 100644 home/fuwn/meta/development/tools/database/default.nix
 create mode 100644 home/fuwn/meta/system/virtualisation/default.nix
 create mode 100644 home/fuwn/meta/system/virtualisation/docker/default.nix

diff --git a/home/fuwn/meta/development/infrastructure/default.nix b/home/fuwn/meta/development/infrastructure/default.nix
index 756050f..c59c1ac 100644
--- a/home/fuwn/meta/development/infrastructure/default.nix
+++ b/home/fuwn/meta/development/infrastructure/default.nix
@@ -1,6 +1,6 @@
-_: {
-  imports = [
-    ./docker
-    ./fly
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    flyctl
+    nodePackages_latest.wrangler
   ];
 }
diff --git a/home/fuwn/meta/development/infrastructure/docker/default.nix b/home/fuwn/meta/development/infrastructure/docker/default.nix
deleted file mode 100644
index 0a17952..0000000
--- a/home/fuwn/meta/development/infrastructure/docker/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    earthly
-  ];
-}
diff --git a/home/fuwn/meta/development/infrastructure/fly/default.nix b/home/fuwn/meta/development/infrastructure/fly/default.nix
deleted file mode 100644
index 9e8147e..0000000
--- a/home/fuwn/meta/development/infrastructure/fly/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    flyctl
-  ];
-}
diff --git a/home/fuwn/meta/development/languages/agnostic/default.nix b/home/fuwn/meta/development/languages/agnostic/default.nix
index 77a3086..2233523 100644
--- a/home/fuwn/meta/development/languages/agnostic/default.nix
+++ b/home/fuwn/meta/development/languages/agnostic/default.nix
@@ -1,7 +1,5 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
-    cmake
-    tup
-    valgrind
+    clang
   ];
 }
diff --git a/home/fuwn/meta/development/languages/c/default.nix b/home/fuwn/meta/development/languages/c/default.nix
deleted file mode 100644
index 2233523..0000000
--- a/home/fuwn/meta/development/languages/c/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    clang
-  ];
-}
diff --git a/home/fuwn/meta/development/languages/csharp/default.nix b/home/fuwn/meta/development/languages/csharp/default.nix
new file mode 100644
index 0000000..b8f8285
--- /dev/null
+++ b/home/fuwn/meta/development/languages/csharp/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    dotnetCorePackages.dotnet_9.sdk
+  ];
+}
diff --git a/home/fuwn/meta/development/languages/default.nix b/home/fuwn/meta/development/languages/default.nix
index 7d5ec7f..b2d1016 100644
--- a/home/fuwn/meta/development/languages/default.nix
+++ b/home/fuwn/meta/development/languages/default.nix
@@ -2,11 +2,12 @@ _: {
   imports = [
     ./agnostic
     # ./assembly
-    ./c
     ./cobol
+    # ./csharp
     ./gleam
     ./go
     # ./hare
+    ./haskell
     ./javascript
     # ./jvm
     ./nim
diff --git a/home/fuwn/meta/development/languages/haskell/default.nix b/home/fuwn/meta/development/languages/haskell/default.nix
new file mode 100644
index 0000000..4c486c6
--- /dev/null
+++ b/home/fuwn/meta/development/languages/haskell/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    haskellPackages.cabal-fmt
+  ];
+}
diff --git a/home/fuwn/meta/development/tools/build/default.nix b/home/fuwn/meta/development/tools/build/default.nix
new file mode 100644
index 0000000..acb16d5
--- /dev/null
+++ b/home/fuwn/meta/development/tools/build/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    cmake
+    just
+    tup
+  ];
+}
diff --git a/home/fuwn/meta/development/tools/database/default.nix b/home/fuwn/meta/development/tools/database/default.nix
new file mode 100644
index 0000000..bdcb852
--- /dev/null
+++ b/home/fuwn/meta/development/tools/database/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    diesel-cli
+  ];
+}
diff --git a/home/fuwn/meta/development/tools/default.nix b/home/fuwn/meta/development/tools/default.nix
index b78b25f..382aa50 100644
--- a/home/fuwn/meta/development/tools/default.nix
+++ b/home/fuwn/meta/development/tools/default.nix
@@ -1,4 +1,9 @@
 { pkgs, ... }: {
+  imports = [
+    ./build
+    ./database
+  ];
+
   home.packages = with pkgs; [
     clang-tools
     highlight
diff --git a/home/fuwn/meta/filesystem/default.nix b/home/fuwn/meta/filesystem/default.nix
index 81f0ed7..b9b5950 100644
--- a/home/fuwn/meta/filesystem/default.nix
+++ b/home/fuwn/meta/filesystem/default.nix
@@ -7,6 +7,8 @@
 
   home.packages = with pkgs; [
     cinnamon.nemo
+    dysk
+    # file-roller
     ncdu
   ];
 }
diff --git a/home/fuwn/meta/multimedia/audio/default.nix b/home/fuwn/meta/multimedia/audio/default.nix
index 73376fb..efe7ac5 100644
--- a/home/fuwn/meta/multimedia/audio/default.nix
+++ b/home/fuwn/meta/multimedia/audio/default.nix
@@ -5,6 +5,7 @@
 
   home.packages = with pkgs; [
     cava
+    # blanket
     blueberry
     spotify
     pavucontrol
diff --git a/home/fuwn/meta/multimedia/default.nix b/home/fuwn/meta/multimedia/default.nix
index 21ca117..4525fdc 100644
--- a/home/fuwn/meta/multimedia/default.nix
+++ b/home/fuwn/meta/multimedia/default.nix
@@ -8,5 +8,6 @@
 
   home.packages = with pkgs; [
     blender
+    epr
   ];
 }
diff --git a/home/fuwn/meta/system/default.nix b/home/fuwn/meta/system/default.nix
index 8fee2ce..afcac7b 100644
--- a/home/fuwn/meta/system/default.nix
+++ b/home/fuwn/meta/system/default.nix
@@ -3,6 +3,7 @@
     ./bitwarden
     ./shell
     ./terminal
+    ./virtualisation
   ];
 
   home.packages = with pkgs; [
diff --git a/home/fuwn/meta/system/virtualisation/default.nix b/home/fuwn/meta/system/virtualisation/default.nix
new file mode 100644
index 0000000..cbbb7b0
--- /dev/null
+++ b/home/fuwn/meta/system/virtualisation/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  imports = [
+    ./docker
+  ];
+
+  home.packages = with pkgs; [
+    valgrind
+  ];
+}
diff --git a/home/fuwn/meta/system/virtualisation/docker/default.nix b/home/fuwn/meta/system/virtualisation/docker/default.nix
new file mode 100644
index 0000000..756e8a2
--- /dev/null
+++ b/home/fuwn/meta/system/virtualisation/docker/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    earthly
+    docker
+    docker-buildx
+    docker-slim
+  ];
+}
-- 
cgit v1.2.3