Merge e8035c42f4 into 4b868d0de6

This reverts commit 92c94fda20.

flake.lock

@@ -131,11 +131,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713714899,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "lastModified": 1713895582,
+        "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
     "plugin-crates-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1713017448,
-        "narHash": "sha256-rRm7xXt5+u76ylWhLYXwjDqxWQL8epfjnTHLv7M+Lc8=",
+        "lastModified": 1713995074,
+        "narHash": "sha256-09+mBhh5hAXENPzrvwNNQEyM7ZtuPYAWrtAG/pzBOV8=",
         "owner": "Saecki",
         "repo": "crates.nvim",
-        "rev": "786d12a70c9b91fa2d0d102bb07df02be0db31a1",
+        "rev": "f00e11e8282b94f2a2e938d32712c99f0e0bdeb4",
         "type": "github"
       },
       "original": {
@@ -566,11 +566,11 @@
     "plugin-dressing-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1710299803,
-        "narHash": "sha256-9AwOFTRvhWFo7USgoFYfceiojZM62IXPpBs8CnSqc18=",
+        "lastModified": 1713925216,
+        "narHash": "sha256-46r7X8CNuMgSB9X1jFLTQAiiBVqszkBP6DPlo6nBAxI=",
         "owner": "stevearc",
         "repo": "dressing.nvim",
-        "rev": "18e5beb3845f085b6a33c24112b37988f3f93c06",
+        "rev": "5162edb1442a729a885c45455a07e9a89058be2f",
         "type": "github"
       },
       "original": {
@@ -646,11 +646,11 @@
     "plugin-gesture-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1713827672,
-        "narHash": "sha256-YsE4mqM5hBsv4uaCYEpqcA6ZhVKgWWQ4/oHVVdX+vnA=",
+        "lastModified": 1713872849,
+        "narHash": "sha256-npryXJ92l65gOGltTd3jE3fdhiEgqbxCdK5w/C/BQV0=",
         "owner": "notomo",
         "repo": "gesture.nvim",
-        "rev": "547f9b50b87e2ec40e72465fc2f975bb6b6232ff",
+        "rev": "47175ed2741ba46fe7f14d6ee37ebbc5b9614c5a",
         "type": "github"
       },
       "original": {
@@ -758,11 +758,11 @@
     "plugin-image-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1713467683,
-        "narHash": "sha256-qSGtiBl94RJMffoxXEV74fNcmrYcKtfPc3Aw65tzuDM=",
+        "lastModified": 1713989303,
+        "narHash": "sha256-UBrusfIYWURI1Auo3XayswA8NXgZhqwazg6wmmgWygA=",
         "owner": "3rd",
         "repo": "image.nvim",
-        "rev": "301de7919b2c0378cb7a782663f67abbcb198b17",
+        "rev": "2d4b479c59fd70cc26f63d48b5cd76a44dda8873",
         "type": "github"
       },
       "original": {
@@ -934,11 +934,11 @@
     "plugin-neocord": {
       "flake": false,
       "locked": {
-        "lastModified": 1713646638,
-        "narHash": "sha256-lcARsc0JxnzYbucRP0pY/bRMsSfm4P4Cpc5A6EoY3Lc=",
+        "lastModified": 1713923379,
+        "narHash": "sha256-oVWdnQlgXIMzMiybMq7yR/WfEW+Fm5RmhWx0RWprlfQ=",
         "owner": "IogaMaster",
         "repo": "neocord",
-        "rev": "014e78cff9f1fc7b3b46ec67fdca68a91a9b7c65",
+        "rev": "aa7a58023166533da83ca7b11c0d2569e45d7381",
         "type": "github"
       },
       "original": {
@@ -1175,11 +1175,11 @@
     "plugin-nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1713863504,
-        "narHash": "sha256-q82z4V3718/XvrCB9zRL5VwMFgkt3KS5olICSV0UUHo=",
+        "lastModified": 1713908193,
+        "narHash": "sha256-VdIoInJj2u49WHN4+WX0kNHdbXgh0AqIPU+OAiUaBck=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "ee3d635692451bc3ef0e5d4b30ea2fbfdeefc373",
+        "rev": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4",
         "type": "github"
       },
       "original": {
@@ -1303,11 +1303,11 @@
     "plugin-nvim-tree-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1713668329,
-        "narHash": "sha256-QEvHQcEAGkm5UKVLc1DYvEqs5/JFNrkEFKHFZpe5ZDE=",
+        "lastModified": 1713946472,
+        "narHash": "sha256-iD8c/dXt/UcTYDK8/zkTkFW/1Ial8ulCUWojjyXpG8k=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa",
+        "rev": "62008e5cf2e8745c9d23bb599ef642963131057e",
         "type": "github"
       },
       "original": {
@@ -1319,11 +1319,11 @@
     "plugin-nvim-treesitter-context": {
       "flake": false,
       "locked": {
-        "lastModified": 1713520917,
-        "narHash": "sha256-AT49dDlwPaV41O+rcUCzzdra8moIg4iDAIhZJb6j0zE=",
+        "lastModified": 1713984790,
+        "narHash": "sha256-QAudKglQGDRJKrsEcMSjbrxTgQRXO60ZcfOvEnPLUoE=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
-        "rev": "ba4289ad345ececd335a9cdd7b9616fd0bb6be92",
+        "rev": "4fe0a54e86859744968e1a5c7867b49c86855774",
         "type": "github"
       },
       "original": {
@@ -2111,11 +2111,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1713745451,
-        "narHash": "sha256-j5/bimg/wI14yTDUXZcSQRosV1LIOYuxYkZjvVJC/yg=",
+        "lastModified": 1713960597,
+        "narHash": "sha256-WAryNIrMfZ48iZSTh8hcHIX9vwh78LMFUtewgY7kp1Y=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "2c86c36e7fe65faac08bdf85d041cf7b798f8ee8",
+        "rev": "71894accd2dd096f5a84166a628b1f075311aafe",
         "type": "github"
       },
       "original": {

modules/plugins/theme/supported_themes.nix

@@ -58,6 +58,7 @@
       	  gitsigns = true,
       	  telescope = true,
       	  treesitter = true,
+          treesitter_context = true,
       	  ts_rainbow = true,
           fidget = true,
           alpha = true,

modules/wrapper/rc/options.nix

@@ -49,8 +49,17 @@ in {
       default = [];
       example = literalExpression ''
         [
-          "$HOME/.config/nvim-extra" # absolute path, as a string - impure
-          ./nvim # relative path, as a path - pure
+          # absolute path, as a string - impure
+          "$HOME/.config/nvim-extra"
+
+          # relative path, as a path - pure
+          ./nvim
+
+          # source type path - pure and reproducible
+          (builtins.source {
+            path = ./runtime;
+            name = "nvim-runtime";
+          })
         ]
       '';
 
@@ -124,9 +133,15 @@ in {
           -- Remove default user runtime paths from the
           -- `runtimepath` option to avoid leaking user configuration
           -- into the final neovim wrapper
-          vim.opt.runtimepath:remove(vim.fn.stdpath('config'))              -- $HOME/.config/nvim
-          vim.opt.runtimepath:remove(vim.fn.stdpath('config') .. "/after")  -- $HOME/.config/nvim/after
-          vim.opt.runtimepath:remove(vim.fn.stdpath('data') .. "/site")     -- $HOME/.local/share/nvim/site
+          local defaultRuntimePaths = {
+            vim.fn.stdpath('config'),              -- $HOME/.config/nvim
+            vim.fn.stdpath('config') .. "/after",  -- $HOME/.config/nvim/after
+            vim.fn.stdpath('data') .. "/site",     -- $HOME/.local/share/nvim/site
+          }
+
+          for _, path in ipairs(defaultRuntimePaths) do
+            vim.opt.runtimepath:remove(path)
+          end
         ''}
 
         ${optionalString cfg.enableLuaLoader "vim.loader.enable()"}
@@ -134,9 +149,9 @@ in {
 
       defaultText = literalMD ''
         By default, this option will **append** paths in
-        [vim.additionalRuntimePaths](#opt-vim.additionalRuntimePaths)
+        [](#opt-vim.additionalRuntimePaths)
         to the `runtimepath` and enable the experimental Lua module loader
-        if [vim.enableLuaLoader](#opt-vim.enableLuaLoader) is set to true.
+        if [](#opt-vim.enableLuaLoader) is set to true.
       '';
 
       example = literalExpression ''"$${builtins.readFile ./my-lua-config-pre.lua}"'';