diff --git a/home/default.nix b/home/default.nix
index 5dabbd7..d59d9f9 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -38,7 +38,7 @@
     tealdeer # tldr
 
     # File management
-    trash-cli
+    gomi
 
     # Nix tools
     nix-output-monitor # nom
@@ -55,7 +55,6 @@
     comment-checker
 
     # Misc
-    micro
   ];
 
   # XDG directories
diff --git a/home/shell/fish.nix b/home/shell/fish.nix
index 942d3a2..6961cd2 100644
--- a/home/shell/fish.nix
+++ b/home/shell/fish.nix
@@ -17,7 +17,7 @@
 
       # Tools
       cat = "bat --paging=never";
-      rm = "trash-put";
+      rm = "gomi";
       lg = "lazygit";
       vi = "nvim";
 
diff --git a/pkgs/comment-checker/default.nix b/pkgs/comment-checker/default.nix
index e31e1f5..05c87e7 100644
--- a/pkgs/comment-checker/default.nix
+++ b/pkgs/comment-checker/default.nix
@@ -1,7 +1,8 @@
-{ lib
-, stdenv
-, fetchurl
-, autoPatchelfHook
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
 }:
 
 let
@@ -17,13 +18,10 @@ let
       url = "https://github.com/code-yeongyu/go-claude-code-comment-checker/releases/download/v${version}/comment-checker_v${version}_linux_amd64.tar.gz";
       hash = "sha256-YLmHQc0bBqyyR9LXRt2k/xWZLpHjna0twNsBbr1lVkY=";
     };
-    "aarch64-linux" = {
-      url = "https://github.com/code-yeongyu/go-claude-code-comment-checker/releases/download/v${version}/comment-checker_v${version}_linux_arm64.tar.gz";
-      hash = "sha256-R3MX5L6t/pllCREVrd54qBFMZEsiaQmeG/0EVu6VwjE=";
-    };
   };
 
-  platformSrc = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  platformSrc =
+    srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 in
 stdenv.mkDerivation {
   pname = "comment-checker";
@@ -49,7 +47,10 @@ stdenv.mkDerivation {
     description = "Multi-language comment detection hook for Claude Code / OpenCode";
     homepage = "https://github.com/code-yeongyu/go-claude-code-comment-checker";
     license = licenses.mit;
-    platforms = [ "aarch64-darwin" "x86_64-linux" "aarch64-linux" ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-linux"
+    ];
     mainProgram = "comment-checker";
   };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
deleted file mode 100644
index 1191a96..0000000
--- a/pkgs/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs }:
-
-{
-  # ── Custom packages ──────────────────────────────────
-  # Packages not in nixpkgs. Build with callPackage.
-  #
-  # Example:
-  # opencode-ai = pkgs.callPackage ./opencode-ai { };
-  #
-  # go-comment-checker = pkgs.buildGoModule {
-  #   pname = "comment-checker";
-  #   version = "0.1.0";
-  #   src = pkgs.fetchFromGitHub {
-  #     owner = "code-yeongyu";
-  #     repo = "go-claude-code-comment-checker";
-  #     rev = "...";
-  #     hash = "sha256-...";
-  #   };
-  #   vendorHash = "sha256-...";
-  # };
-}