From b4af26b504ef228dc4218d559d48d6c058c18dec Mon Sep 17 00:00:00 2001
From: karitham <kar@karitham.dev>
Date: Sat, 18 Apr 2026 15:18:02 +0200
Subject: [PATCH] refactor: consolidate package definitions

- Remove duplicate pokego from overlays/default.nix (already in pkgs/)
- Overlays now only contain genuine nixpkgs overrides (golangci-lint-langserver, gotools, litestream)
- Update nushell.nix to reference self'.packages.pokego instead of overlay
---
 modules/default.nix           | 10 +++++++++-
 modules/dev/shell/nushell.nix |  3 ++-
 modules/overlays/default.nix  |  1 -
 treefmt.toml                  | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 treefmt.toml

diff --git a/modules/default.nix b/modules/default.nix
index 220d379..edcede8 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -38,7 +38,15 @@
         '';
       };
       formatter = pkgs.nixfmt;
-      devShells.default = pkgs.mkShell { packages = with pkgs; [ sops ]; };
+      devShells.default = pkgs.mkShell {
+        packages = with pkgs; [
+          sops
+          treefmt
+          nixfmt
+          nufmt
+          biome
+        ];
+      };
     };
 
   flake =
diff --git a/modules/dev/shell/nushell.nix b/modules/dev/shell/nushell.nix
index da50c53..c641b74 100644
--- a/modules/dev/shell/nushell.nix
+++ b/modules/dev/shell/nushell.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  self',
   ...
 }:
 {
@@ -19,7 +20,7 @@
 
         source-env (if ("~/.profile.nu" | path exists) { "~/.profile.nu" } else null)
 
-        ${lib.getExe pkgs.pokego} -l french
+        ${lib.getExe self'.packages.pokego} -l french
       '';
 
       extraLogin = ''
diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
index c2e6676..f98b852 100644
--- a/modules/overlays/default.nix
+++ b/modules/overlays/default.nix
@@ -1,5 +1,4 @@
 _: prev: {
-  pokego = prev.callPackage ../pkgs/pokego.nix { };
   golangci-lint-langserver = prev.golangci-lint-langserver.overrideAttrs (_: {
     patches = prev.fetchurl {
       url = "https://github.com/karitham/golangci-lint-langserver/commit/4a7b5b7ee99a2260c118442304777a8a92a45765.patch";
diff --git a/treefmt.toml b/treefmt.toml
new file mode 100644
index 0000000..e7690a2
--- /dev/null
+++ b/treefmt.toml
@@ -0,0 +1,14 @@
+[formatter.nix]
+command = "nixfmt"
+options = ["-s", "-w", "120"]
+includes = ["*.nix"]
+
+[formatter.nu]
+command = "nufmt"
+includes = ["*.nu"]
+
+[formatter.json]
+command = "biome"
+options = ["format", "--write", "--indent-style=space", "--indent-width=2"]
+includes = ["*.json"]
+excludes = ["secrets/**", "modules/desktop/audio/**"]
-- 
2.51.2