diff --git a/home/devel.nix b/home/devel.nix
new file mode 100644
index 0000000..5158e5c
--- /dev/null
+++ b/home/devel.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, inputs, lib, ... }:
+
+{
+  home.packages = with pkgs; [
+    bundler
+    bundix
+    nodejs
+    yarn-berry
+    duckdb
+    tippecanoe
+    pmtiles
+  ];
+
+  imports = [
+    ./r.nix
+  ];
+
+}
diff --git a/home/on-server.nix b/home/on-server.nix
index 0578b19..a951b8a 100644
--- a/home/on-server.nix
+++ b/home/on-server.nix
@@ -5,18 +5,9 @@
     prefix = ${config.xdg.dataHome}/npm/packages
   '';
 
-  home.packages = with pkgs; [
-
-    # development
-    bundler
-    bundix
-    nodejs
-    appimage-run
-    yarn
-
-  ];
-
   imports = [
     ./minimal.nix
+    ./devel.nix
   ];
+
 }
diff --git a/home/slim-desktop.nix b/home/slim-desktop.nix
index 9181845..5e1b12f 100644
--- a/home/slim-desktop.nix
+++ b/home/slim-desktop.nix
@@ -50,32 +50,22 @@
     rhythmbox
     vlc
 
-    # development
     appimage-run
-    bundler
-    bundix
-    nodejs
-    yarn
 
     # secrets
     libsecret
     keepassxc
     yubioath-flutter
 
-    # geospatial
-    duckdb
-    tippecanoe
-    pmtiles
-
   ];
 
   imports = [
     ./minimal.nix
+    ./devel.nix
     ./calendars.nix
     ./foot.nix
     ./mail
     ./openconnect.nix
-    ./r.nix
   ];
 
   programs.taskwarrior = {