diff --git a/configs/common.nix b/configs/common.nix
index 57bd464..92296b0 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -238,30 +238,27 @@
         	 wrapProgram $out/bin/nvim \
         	 --prefix PATH : ${
             pkgs.lib.makeBinPath [
+              # lsps
               pkgs.lua-language-server
               pkgs.vscode-langservers-extracted
-              (vimPlugins.nvim-treesitter.withPlugins (p: [
-                p.norg
-                p.norg-meta
-                p.lua
-                p.vim
-              ]))
               pkgs.emmet-ls
-              pkgs.lua5_1
-              pkgs.tree-sitter
-              pkgs.tree-sitter-grammars.tree-sitter-norg
               pkgs.prettier
-              pkgs.luarocks
               pkgs.black
               pkgs.nixfmt
-              pkgs.ripgrep
               pkgs.nil
-              pkgs.nixd
-              pkgs.gcc
-              pkgs.gnumake
               pkgs.typescript-language-server
               pkgs.tailwindcss-language-server
               pkgs.stylua
+              pkgs.nixd
+
+              # other shit
+              pkgs.vimPlugins.nvim-treesitter
+              pkgs.lua5_1
+              inputs.tree-sitter.packages.${stdenv.hostPlatform.system}.default
+              inputs.norg-sitter.packages.${stdenv.hostPlatform.system}.default
+              pkgs.ripgrep
+              pkgs.gcc
+              pkgs.gnumake
             ]
           }
         	 '';
diff --git a/flake.lock b/flake.lock
index f288731..5199316 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,6 +70,24 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_3"
@@ -163,6 +181,18 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1722555339,
+        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1767379071,
@@ -212,6 +242,37 @@
       }
     },
     "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1723737611,
+        "narHash": "sha256-PFWdNM5D2qKeDl9H/5ImPnBjEuleHkWwCc3Pm91zT58=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fd61e577354dcc704bfcdc82d26608196fad6043",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1756787288,
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1768564909,
         "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@@ -227,7 +288,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1761597516,
         "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
@@ -243,6 +304,25 @@
         "type": "github"
       }
     },
+    "norg-sitter": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1725461847,
+        "narHash": "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw=",
+        "owner": "nvim-neorg",
+        "repo": "tree-sitter-norg",
+        "rev": "d89d95af13d409f30a6c7676387bde311ec4a2c8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "tree-sitter-norg",
+        "type": "github"
+      }
+    },
     "pinned-nixpkgs": {
       "flake": false,
       "locked": {
@@ -268,6 +348,8 @@
         "hyprfloat": "hyprfloat",
         "mesa-davinci": "mesa-davinci",
         "nixpkgs": "nixpkgs_4",
+        "norg-sitter": "norg-sitter",
+        "tree-sitter": "tree-sitter",
         "walker": "walker",
         "way-edges": "way-edges"
       }
@@ -353,6 +435,25 @@
         "type": "github"
       }
     },
+    "tree-sitter": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1765318765,
+        "narHash": "sha256-RycoHWegJJ6HI+6WeUUphSyo3n0KnDziMNp88YwgVa4=",
+        "owner": "tree-sitter",
+        "repo": "tree-sitter",
+        "rev": "8b8199775f96ca8642cf7860da46100875b38453",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tree-sitter",
+        "ref": "8b8199775f96ca8642cf7860da46100875b38453",
+        "repo": "tree-sitter",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems"
@@ -376,7 +477,7 @@
         "elephant": [
           "elephant"
         ],
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_7",
         "systems": "systems_4"
       },
       "locked": {
@@ -395,7 +496,7 @@
     },
     "way-edges": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_8",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 7f2fcb6..a49cd8f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,10 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
     elephant.url = "github:abenz1267/elephant";
     chataigne.url = "./modules/chataigne";
+
+    tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453";
+    norg-sitter.url = "github:nvim-neorg/tree-sitter-norg";
+
     doot.url = "github:voidarclabs/nixos.doot";
     way-edges.url = "github:way-edges/way-edges";
     hyprfloat = {