diff --git a/nix/nixos/configuration.nix b/nix/nixos/configuration.nix
index 2669159..a84c00f 100644
--- a/nix/nixos/configuration.nix
+++ b/nix/nixos/configuration.nix
@@ -41,6 +41,7 @@
   users.users.pan = {
     isNormalUser = true;
     extraGroups = [ "networkmanager" "wheel" ];
+    uid = 1000;
     shell = pkgs.zsh;
   };
 
@@ -52,9 +53,19 @@
 
   nixpkgs.config.allowUnfree = true;
 
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
+  };
+
+  # Automatic Store Optimization
+  nix.settings.auto-optimise-store = true;
+
   environment.systemPackages = with pkgs; [
     git
     wget
     curl
+    vim
   ];
 }
diff --git a/nix/nixos/modules/dev.nix b/nix/nixos/modules/dev.nix
index 7b3c42e..b3439fd 100644
--- a/nix/nixos/modules/dev.nix
+++ b/nix/nixos/modules/dev.nix
@@ -11,13 +11,8 @@
     visidata
     bubblewrap
 
-    # TODO: Custom packages - need to verify availability or create derivations
-    # These packages were in the original configuration but may need custom setup:
-    # claude-code
-    # opencode
-    # gemini-cli
-
-    # Uncomment the above packages if they are available in your nixpkgs,
-    # or create custom derivations for them in a separate packages/ directory.
+    claude-code
+    opencode
+    gemini-cli
   ];
 }