diff --git a/common/home.nix b/common/home.nix
index 54467f9e..470cccce 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -60,19 +60,15 @@ in {
       bottom
       btop
       cachix
-      d2
       deploy-rs
       dust
       fd
       file
       fzf
       gnupg
-      go
       gpg-tui
-      hasklig
       hotedit
       jq
-      jujutsu
       just
       macchina
       p7zip
@@ -86,16 +82,21 @@ in {
       yt-dlp
     ]
     ++ lib.optionals (!device.isServer) [
+      clang
+      cmake
+      d2
+      devenv
+      go
+      hasklig
+      jujutsu
+      monaspace
       nerd-fonts.fira-code
       nerd-fonts.hasklug
       nerd-fonts.symbols-only
-      clang
-      cmake
-      devenv
-      monaspace
       qmk
       ttyper
       yarn
+      zed-editor
     ]
     ++ lib.optionals device.isLinux [
       dig
diff --git a/flake.lock b/flake.lock
index bd9b7e16..fa4b9a57 100644
--- a/flake.lock
+++ b/flake.lock
@@ -762,11 +762,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733318908,
-        "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
+        "lastModified": 1734279981,
+        "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
+        "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785",
         "type": "github"
       },
       "original": {
@@ -885,11 +885,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733484277,
-        "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
+        "lastModified": 1734093295,
+        "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
+        "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
         "type": "github"
       },
       "original": {
@@ -1401,16 +1401,15 @@
     "neorg": {
       "flake": false,
       "locked": {
-        "lastModified": 1721818770,
-        "narHash": "sha256-f6hJbZEcf9XGTLxUikTOu2Kq53hlAC08JJbz76gQk6I=",
+        "lastModified": 1734188232,
+        "narHash": "sha256-xH87caxEebrWLwY/v3xyyOy6PTG/ZqX2OfCdwg/RqDY=",
         "owner": "nvim-neorg",
         "repo": "neorg",
-        "rev": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be",
+        "rev": "6b945909d84b5aeadc875f9b3f529ec44b9bc60f",
         "type": "github"
       },
       "original": {
         "owner": "nvim-neorg",
-        "ref": "v9.1.1",
         "repo": "neorg",
         "type": "github"
       }
@@ -1431,38 +1430,6 @@
         "type": "github"
       }
     },
-    "neorg-telescope_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722358034,
-        "narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=",
-        "owner": "nvim-neorg",
-        "repo": "neorg-telescope",
-        "rev": "ddb2556644cae922699a239bbb0fe16e25b084b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neorg",
-        "repo": "neorg-telescope",
-        "type": "github"
-      }
-    },
-    "neorg_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733872345,
-        "narHash": "sha256-6pUwWfsJ0TmToGU7Bvaeobnj2vuIqwd4w3TDdTvQZSk=",
-        "owner": "nvim-neorg",
-        "repo": "neorg",
-        "rev": "62671a7b03a1f38a6e5e03b006a9b6f8d804be0e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-neorg",
-        "repo": "neorg",
-        "type": "github"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -1734,11 +1701,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1734103614,
-        "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=",
+        "lastModified": 1734412481,
+        "narHash": "sha256-U2CM2IisVgI+iKjkBw0KglyP7DwCIUwTBaz2bhMcTak=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3",
+        "rev": "30895485c3a31bb16ace513def4f3a36bfeb68c6",
         "type": "github"
       },
       "original": {
@@ -1750,8 +1717,8 @@
     "nno": {
       "inputs": {
         "flake-utils": "flake-utils_7",
-        "neorg": "neorg_2",
-        "neorg-telescope": "neorg-telescope_2",
+        "neorg": "neorg",
+        "neorg-telescope": "neorg-telescope",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -1759,11 +1726,11 @@
         "norg-meta": "norg-meta"
       },
       "locked": {
-        "lastModified": 1734078148,
-        "narHash": "sha256-W3MlwXmWDMJoWwp6N+874Eh7ksq43yBXmm5HCTCLvjQ=",
+        "lastModified": 1734279554,
+        "narHash": "sha256-DQlYO54f4LmOv7NGPMTMGBXzWumh6d0JygK8S7Cru0M=",
         "owner": "nvim-neorg",
         "repo": "nixpkgs-neorg-overlay",
-        "rev": "1f1d248bd728946582a13e29de4638131af4f66b",
+        "rev": "8a58c04c6433c2ba48fa4a409932960098a48053",
         "type": "github"
       },
       "original": {
@@ -1843,11 +1810,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733411491,
-        "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=",
+        "lastModified": 1733773348,
+        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe",
+        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
         "type": "github"
       },
       "original": {
@@ -1996,8 +1963,6 @@
         "musnix": "musnix",
         "navigator": "navigator",
         "neogit": "neogit",
-        "neorg": "neorg",
-        "neorg-telescope": "neorg-telescope",
         "nix-darwin": "nix-darwin",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_4",
@@ -2455,11 +2420,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733440889,
-        "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
+        "lastModified": 1733761991,
+        "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
+        "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c2b51f2d..e7f3b457 100644
--- a/flake.nix
+++ b/flake.nix
@@ -94,14 +94,6 @@
       url = "github:giusgad/pets.nvim";
       flake = false;
     };
-    neorg = {
-      url = "github:nvim-neorg/neorg/v9.1.1";
-      flake = false;
-    };
-    neorg-telescope = {
-      url = "github:nvim-neorg/neorg-telescope";
-      flake = false;
-    };
     rest-nvim = {
       url = "github:rest-nvim/rest.nvim";
       flake = false;