diff --git a/modules/common/helix.nix b/modules/common/helix.nix
index d46813c..7579d1c 100644
--- a/modules/common/helix.nix
+++ b/modules/common/helix.nix
@@ -6,20 +6,20 @@ in {
     shellAliases.x   = "hx";
   };
 
-  nixpkgs.overlays = [(self: super: {
-    helix = super.helix.overrideAttrs (old: {
-      src = self.fetchzip {
-        url = "https://github.com/cull-os/helix/releases/download/ci-release-25.01.1/helix-ci-release-25.01.1-source.tar.xz";
-        hash = "sha256-bvlzXRAdPvz8P49KENSw9gupQNaUm/+3eZZ1q7+fTsw=";
-        stripRoot = false;
-      };
+  # nixpkgs.overlays = [(self: super: {
+  #   helix = super.helix.overrideAttrs (old: {
+  #     src = self.fetchzip {
+  #       url = "https://github.com/cull-os/helix/releases/download/ci-release-25.01.1/helix-ci-release-25.01.1-source.tar.xz";
+  #       hash = "sha256-bvlzXRAdPvz8P49KENSw9gupQNaUm/+3eZZ1q7+fTsw=";
+  #       stripRoot = false;
+  #     };
 
-      cargoDeps = self.rustPlatform.fetchCargoVendor {
-        inherit (self.helix) src;
-        hash = "sha256-soOnSRvWO7OzxYENFUBGmgSAk1Oy9Av+wDDLKkcuIbs=";
-      };
-    });
-  })];
+  #     cargoDeps = self.rustPlatform.fetchCargoVendor {
+  #       inherit (self.helix) src;
+  #       hash = "sha256-soOnSRvWO7OzxYENFUBGmgSAk1Oy9Av+wDDLKkcuIbs=";
+  #     };
+  #   });
+  # })];
 
   home-manager.sharedModules = [{
     programs.nushell.configFile.text = mkIf /*(*/config.isDesktop/* && config.isLinux)*/ <| mkAfter /* nu */ ''
diff --git a/modules/common/packages.nix b/modules/common/packages.nix
index f89f622..42d46a9 100644
--- a/modules/common/packages.nix
+++ b/modules/common/packages.nix
@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }: let
   inherit (lib) attrValues optionalAttrs;
 in {
+  unfree.allowedNames = [ "claude-code" ];
+
   environment.systemPackages = attrValues <| {
     inherit (pkgs)
       asciinema
@@ -35,14 +37,14 @@ in {
     ;
   } // optionalAttrs config.isDesktop {
     inherit (pkgs)
+      claude-code
+
       clang_16
       clang-tools_16
       deno
       gh
       go
-      jdk
       lld
-      maven
       zig
 
       qbittorrent
diff --git a/modules/common/unfree.nix b/modules/common/unfree.nix
new file mode 100644
index 0000000..64a608c
--- /dev/null
+++ b/modules/common/unfree.nix
@@ -0,0 +1,7 @@
+{ config, lib, ... }: let
+  inherit (lib) mkValue;
+in {
+  options.unfree.allowedNames = mkValue [];
+
+  config.nixpkgs.config.allowUnfreePredicate = package: lib.elem package.pname config.unfree.allowedNames;
+}