diff --git a/flake.lock b/flake.lock
index 822b7a7..f64432a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -193,6 +193,22 @@
         "type": "github"
       }
     },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -244,6 +260,21 @@
         "type": "github"
       }
     },
+    "flake-root_2": {
+      "locked": {
+        "lastModified": 1680964220,
+        "narHash": "sha256-dIdTYcf+KW9a4pKHsEbddvLVSfR1yiAJynzg2x0nfWg=",
+        "owner": "srid",
+        "repo": "flake-root",
+        "rev": "f1c0b93d05bdbea6c011136ba1a135c80c5b326c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "flake-root",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -295,6 +326,24 @@
         "type": "github"
       }
     },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -366,11 +415,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690652600,
-        "narHash": "sha256-Dy09g7mezToVwtFPyY25fAx1hzqNXv73/QmY5/qyR44=",
+        "lastModified": 1690790567,
+        "narHash": "sha256-fymHCZFy+qjrNh+EZDHYEEtbZw1TvjtxtCBPBSWU7CM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f58889c07efa8e1328fdf93dc1796ec2a5c47f38",
+        "rev": "729ab77f9e998e0989fa30140ecc91e738bc0cb1",
         "type": "github"
       },
       "original": {
@@ -414,11 +463,11 @@
         "weewx-proxy-flake": "weewx-proxy-flake"
       },
       "locked": {
-        "lastModified": 1690705056,
-        "narHash": "sha256-CkskQ1JXvYu+cSG3oz+zjULJyXhfYOxB5ajuNCNxjLc=",
+        "lastModified": 1690791656,
+        "narHash": "sha256-OkM7FTexiiG14A/NnajhS6QT62CtUdprTj4LSQGyYvs=",
         "owner": "nifoc",
         "repo": "nix-overlay",
-        "rev": "c23851d878339281b3f68ee1b64708651a258098",
+        "rev": "1912c28e50f4bbf10005f8cc8cfa2ab8fa112329",
         "type": "github"
       },
       "original": {
@@ -563,15 +612,61 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable_3": {
+      "locked": {
+        "lastModified": 1685801374,
+        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_3",
+        "gitignore": [
+          "nifoc-overlay",
+          "weewx-proxy-flake",
+          "gitignore"
+        ],
+        "nixpkgs": [
+          "nifoc-overlay",
+          "weewx-proxy-flake",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable_2"
+      },
+      "locked": {
+        "lastModified": 1690743255,
+        "narHash": "sha256-dsJzQsyJGWCym1+LMyj2rbYmvjYmzeOrk7ypPrSFOPo=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "fcbf4705d98398d084e6cb1c826a0b90a91d22d7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks-nix_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "flake-utils": "flake-utils_4",
         "gitignore": "gitignore_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
         "lastModified": 1690743255,
@@ -601,8 +696,8 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-stable": "nixos-stable",
         "nixpkgs": "nixpkgs",
-        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "treefmt-nix": "treefmt-nix"
+        "pre-commit-hooks-nix": "pre-commit-hooks-nix_2",
+        "treefmt-nix": "treefmt-nix_2"
       }
     },
     "rust-overlay": {
@@ -662,7 +757,44 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nifoc-overlay",
+          "weewx-proxy-flake",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1689620039,
+        "narHash": "sha256-BtNwghr05z7k5YMdq+6nbue+nEalvDepuA7qdQMAKoQ=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "719c2977f958c41fa60a928e2fbc50af14844114",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -703,18 +835,21 @@
           "nifoc-overlay",
           "flake-parts"
         ],
+        "flake-root": "flake-root_2",
         "gitignore": "gitignore",
         "nixpkgs": [
           "nifoc-overlay",
           "nixpkgs"
-        ]
+        ],
+        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1688906606,
-        "narHash": "sha256-dACFT9SbVJ3Q3LdlW3MhcAqvPJIK++3jR302TpCZy4Y=",
+        "lastModified": 1690757618,
+        "narHash": "sha256-OQMIdYsSsgQZvTVs+afPLsp3rWlRab+cqfFTvW+58Jo=",
         "owner": "nifoc",
         "repo": "weewx-proxy",
-        "rev": "ed89285fc853f8305eac2f9870b5b799aeb69cac",
+        "rev": "7cf7b039664cbb1e47c38ba1561ad83038c5ded4",
         "type": "github"
       },
       "original": {
diff --git a/home/config/nvim/plugins/treesitter.fnl b/home/config/nvim/plugins/treesitter.fnl
index 2ba0bc0..6a44885 100644
--- a/home/config/nvim/plugins/treesitter.fnl
+++ b/home/config/nvim/plugins/treesitter.fnl
@@ -1,40 +1,5 @@
-(let [treesitter (require :nvim-treesitter)
-      treesitter-config (require :nvim-treesitter.configs)
-      treesitter-parsers (require :nvim-treesitter.parsers)
+(let [treesitter-config (require :nvim-treesitter.configs)
       nifoc-treesitter (require :nifoc.treesitter)
-      install-parsers [:bash
-                       :comment
-                       :css
-                       :dockerfile
-                       :eex
-                       :elixir
-                       :erlang
-                       :fennel
-                       :fish
-                       :heex
-                       :html
-                       :http
-                       :java
-                       :javascript
-                       :jsdoc
-                       :json
-                       :lua
-                       :make
-                       :markdown
-                       :markdown_inline
-                       :nix
-                       :query
-                       :regex
-                       :ruby
-                       :scss
-                       :sql
-                       :svelte
-                       :toml
-                       :tsx
-                       :typescript
-                       :vim
-                       :yaml]
-      rainbow-parsers [:css :fennel :json :query :yaml]
       disable-parsers []]
   (nifoc-treesitter.setup)
   (treesitter-config.setup {:ensure_installed []
diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix
index 17269f6..e57a3bb 100644
--- a/home/hosts/Styx.nix
+++ b/home/hosts/Styx.nix
@@ -55,6 +55,7 @@
       glow
       hexyl
       hyperfine
+      just
       lnav
       mtr
       nix-tree
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index 9842ddf..ee2d1db 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -156,6 +156,8 @@ in
           type = "fennel";
         }
 
+        vim-just
+
         {
           plugin = rainbow-delimiters-nvim;
           config = builtins.readFile ../../config/nvim/plugins/rainbow-delimiters.fnl;
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index e4a716a..7cbebf9 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -127,6 +127,17 @@ in
       fetchSubmodules = false;
     };
   };
+  vim-just = buildVimPluginFrom2Nix {
+    pname = "vim-just";
+    version = "2023-07-30";
+    src = fetchFromGitHub {
+      owner = "NoahTheDuke";
+      repo = "vim-just";
+      rev = "9129b096a6b43e0a47e405cc7b3fb55bc0e31c42";
+      sha256 = "04sh6xdnmb89gw31wjd1zd4jwl4cwb4731qpkgz59rh5cdiv27qr";
+      fetchSubmodules = false;
+    };
+  };
   rainbow-delimiters-nvim = buildVimPluginFrom2Nix {
     pname = "rainbow-delimiters.nvim";
     version = "2023-07-30";
diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml
index 5898115..2cb0a40 100644
--- a/home/programs/nvim/plugins.yaml
+++ b/home/programs/nvim/plugins.yaml
@@ -13,6 +13,7 @@
 - src: Mofiqul/dracula.nvim
 # Syntax
 - src: nvim-treesitter/nvim-treesitter
+- src: NoahTheDuke/vim-just
 - src: HiPhish/rainbow-delimiters.nvim
 - src: nvim-treesitter/playground
 # Telescope