diff --git a/flake.lock b/flake.lock
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@ "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1764161084,
-        "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
+        "lastModified": 1767028240,
+        "narHash": "sha256-0/fLUqwJ4Z774muguUyn5t8AQ6wyxlNbHexpje+5hRo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "e95de00a471d07435e0527ff4db092c84998698e",
+        "rev": "c31afa6e76da9bbc7c9295e39c7de9fca1071ea1",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@ }
     },
     "darwin-stable": {
       "locked": {
-        "lastModified": 1764794491,
-        "narHash": "sha256-53ax34WU7ScLVbHWVuWgeJ6hHtKUJoRLd7mLvoqcnDE=",
+        "lastModified": 1767190699,
+        "narHash": "sha256-61alfmn3atapSHUSdz7bXHIWJcFof5ap2aXqFnXE2AQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "db8ef220795ce3c1d0c96987dccd5534db780135",
+        "rev": "b203dfb5226de9961ba9ea5c9081fd0e5e85932a",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@ "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@ "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1764912896,
-        "narHash": "sha256-ftxQocr098v5ngqB3SXa9tW6aqovBSBOEdIRcLEj44c=",
+        "lastModified": 1767104570,
+        "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6bcb2395ab9ed05616052262da526cd7c5b4b123",
+        "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
         "type": "github"
       },
       "original": {
@@ -326,11 +326,11 @@ "norg": "norg",
         "norg-meta": "norg-meta"
       },
       "locked": {
-        "lastModified": 1764904659,
-        "narHash": "sha256-qfLaJwnuY+yXH+8BfDaXFVPTLhQFWsopcD09Erh54N4=",
+        "lastModified": 1767262885,
+        "narHash": "sha256-OhboWVMe5ENdk9+DzCB2Qf9KATn8xHAbBvhvE8A61t8=",
         "owner": "nvim-neorg",
         "repo": "nixpkgs-neorg-overlay",
-        "rev": "025de974acdc227c82e3731c524e16e113da8c99",
+        "rev": "cfa18c14358de5f7ec8b3b0922b1af97df0ab5af",
         "type": "github"
       },
       "original": {
@@ -371,11 +371,11 @@ }
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1761765539,
-        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
         "type": "github"
       },
       "original": {
@@ -430,11 +430,11 @@ }
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1764856222,
-        "narHash": "sha256-yEJmtoFu4cJre1NuU4fb8q57Oux+NTbocnALtJ64aEI=",
+        "lastModified": 1767242400,
+        "narHash": "sha256-knFaYjeg7swqG1dljj1hOxfg39zrIy8pfGuicjm9s+o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ece6e266caf1effab32eceef0403b797b4330373",
+        "rev": "c04833a1e584401bb63c1a63ddc51a71e6aa457a",
         "type": "github"
       },
       "original": {
diff --git a/modules/git.nix b/modules/git.nix
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -26,8 +26,8 @@ pkgs.git-gone
     pkgs.git-cliff
     # pkgs.git-revise
     # pkgs.gitAndTools.git-imerge
-    # pkgs.prr
-    inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.prr
+    pkgs.prr
+    # inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.prr
     pkgs.hut
     inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.imbox
     # pkgs.radicle-node
diff --git a/modules/nvim.nix b/modules/nvim.nix
--- a/modules/nvim.nix
+++ b/modules/nvim.nix
@@ -34,8 +34,8 @@ start = [
           plugins.packer-nvim
           plugins.vim-nickel
           # plugins.lua-utils-nvim
-          plugins.neorg
-          plugins.neorg-telescope
+          # plugins.neorg
+          # plugins.neorg-telescope
           plugins.nvim-treesitter.withAllGrammars
         ];
 
diff --git a/modules/nvim/init.fnl b/modules/nvim/init.fnl
--- a/modules/nvim/init.fnl
+++ b/modules/nvim/init.fnl
@@ -94,6 +94,16 @@ (let [cwd (fun.getcwd)
                      project (fun.fnamemodify cwd ":p:~:h")]
                  (set opt.titlestring (.. "nvim " project))))))
 
+(do ; TreeSitter
+  (let [try-start (fn []
+                (let [(value _error) (vim.treesitter.get_parser nil nil {:error false})]
+                  (if value (vim.treesitter.start))))]
+    (defcommand TSStart (try-start))
+    (defcommand TSStop (vim.treesitter.stop))
+    (augroup ts-start
+             (on FileType [:elixir :eex :heex :fennel :rust :nix :css] (try-start)))))
+
+
 (do ; Split in CORRECT places
   (opt {:splitright true :splitbelow true}))
 
@@ -279,17 +289,17 @@ :find_left :gsF
                        :highlight ""
                        :replace :gss
                        :update_n_lines ""}})
-    (setup :nvim-treesitter.configs
-           {:highlight {:enable true
-                        ; Currently disable as it do not work as expected
-                        :disable [:erlang :make :diff]}
-            :matchup {:enable true}
-            :indent {:enable true}
-            :incremental_selection {:enable true}})
-     (setup :neorg
-            {:load {:core.defaults {}
-                    :core.concealer {}}})
-     ))
+    ; (setup :nvim-treesitter
+    ;        {:highlight {:enable true
+    ;                     ; Currently disable as it do not work as expected
+    ;                     :disable [:erlang :make :diff]}
+    ;         :matchup {:enable true}
+    ;         :indent {:enable true}
+    ;         :incremental_selection {:enable true}})
+    ; (setup :neorg
+    ;        {:load {:core.defaults {}
+    ;                :core.concealer {}}})
+    ))
 
 (defcommand Clean "keeppatterns %s/\\s\\+$//e | set nohlsearch")
 
diff --git a/modules/nvim/lua/basic.lua b/modules/nvim/lua/basic.lua
--- a/modules/nvim/lua/basic.lua
+++ b/modules/nvim/lua/basic.lua
@@ -35,7 +35,7 @@
 debug.traceback = fennel.traceback
 
 -- Command-mode Fennel execution
-vim.api.nvim_create_user_command('Fnl', function(arg) fennel.eval(arg.args) end, {nargs = '*'})
+vim.api.nvim_create_user_command('Fnl', function(arg) print(fennel.eval(arg.args)) end, {nargs = '*'})
 vim.api.nvim_create_user_command('FnlFile', function(arg) print(fennel.view(arg.args)) end, {nargs = 1})
 
 _G.reloadable = {}
diff --git a/pkgs/default.nix b/pkgs/default.nix
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -4,7 +4,6 @@ entr,
   ripgrep,
   writeShellApplication,
 }: {
-  prr = callPackage ./prr.nix {};
   imbox = callPackage ./imbox.nix {};
   ubin-client = callPackage ./ubin-client.nix {};
   hosevka = callPackage ./hosevka.nix {};
diff --git a/pkgs/prr.nix b/pkgs/prr.nix
deleted file mode 100644
--- a/pkgs/prr.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  stdenv,
-  rustPlatform,
-  openssl,
-  zlib,
-  darwin,
-  fetchFromGitHub,
-  lib,
-  pkg-config,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "prr";
-  version = "0.17.0";
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs =
-    [
-      openssl
-      zlib
-    ];
-
-  src = fetchFromGitHub {
-    owner = "danobi";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-siQZ3rDKv2lnn1bmisRsexWwfvmMhK+z4GZGPsrfPgc=";
-  };
-
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-VIJFr1HpXMC2DXt79Yb1DuLYSbo9g6zsXaNDTXjtlR4=";
-
-  meta = with lib; {
-    description = "Mailing list style code reviews for GitHub";
-    homepage = "https://github.com/danobi/prr";
-    license = licenses.gpl2;
-    maintainers = [];
-  };
-}