diff --git a/flake.lock b/flake.lock
index c6ec113..57a6b96 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725628988,
-        "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=",
+        "lastModified": 1725893417,
+        "narHash": "sha256-fj2LxTZAncL/s5NrtXe1nLfO0XDvRixtCu3kmV9jDPw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6",
+        "rev": "10541f19c584fe9633c921903d8c095d5411e041",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725534445,
-        "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=",
+        "lastModified": 1725816686,
+        "narHash": "sha256-0Kq2MkQ/sQX1rhWJ/ySBBQlBJBUK8mPMDcuDhhdBkSU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39",
+        "rev": "add0443ee587a0c44f22793b8c8649a0dbc3bb00",
         "type": "github"
       },
       "original": {
diff --git a/modules/pkgs.nix b/modules/pkgs.nix
index e84ea43..6d464cb 100644
--- a/modules/pkgs.nix
+++ b/modules/pkgs.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  shared = with pkgs; [
+  utils = with pkgs; [
     just
     bat
     zoxide
@@ -14,8 +14,6 @@ let
 
     fastfetch
     neovim
-
-    bash-language-server
   ];
 
   darwin =
@@ -24,8 +22,11 @@ let
     [
       arc-browser
       wezterm
+      raycast
+
       frameworks.Security
       frameworks.CoreFoundation
+
       (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
     ];
 
@@ -35,29 +36,14 @@ let
       clang
       stylua
       nixfmt-rfc-style
+
       nil
       lua-language-server
-    ]
-    ++ (import ./dev.nix { pkgs = pkgs; });
-
-  server =
-    with pkgs;
-    with pkgs.nodePackages_latest;
-    [
-      yazi
-      tmux
-      bun
-
-      docker-compose
-
-      nodejs_22
-      pnpm
       bash-language-server
-      typescript-language-server
-    ];
-
+    ]
+    ++ (import ./rust.nix { pkgs = pkgs; });
 in
 {
-  home.packages = shared ++ development ++ (if pkgs.stdenv.isDarwin then darwin else server);
+  home.packages = utils ++ development ++ darwin;
 
 }
diff --git a/modules/dev.nix b/modules/rust.nix
similarity index 75%
rename from modules/dev.nix
rename to modules/rust.nix
index 3d339ad..833f627 100644
--- a/modules/dev.nix
+++ b/modules/rust.nix
@@ -3,6 +3,5 @@ with pkgs;
 [
   rustup
   cargo-watch
-
-  go
+  cargo-generate
 ]