diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock
index 2456c4d..0800ebb 100644
--- a/nix/base-system/flake.lock
+++ b/nix/base-system/flake.lock
@@ -54,15 +54,17 @@
           "nixpkgs"
         ],
         "nurl-flake": "nurl-flake",
+        "nvim-bnf-src": "nvim-bnf-src",
         "roslyn-lsp": "roslyn-lsp",
-        "treesitter-context": "treesitter-context"
+        "treesitter-context": "treesitter-context",
+        "victoria-logs-src": "victoria-logs-src"
       },
       "locked": {
-        "lastModified": 1728423355,
-        "narHash": "sha256-purHXipPRWJAxFAjRevkbq4mtoOqGTzdpql/ifzDiw8=",
+        "lastModified": 1728497279,
+        "narHash": "sha256-O0/mAUkaFzfN9MZ/p343P0nY9JIJWsCyDSQgOtBhJkw=",
         "owner": "zaphar",
         "repo": "nix-flakes",
-        "rev": "a489c4f6818b31b1839463735cd3be07dcccb5da",
+        "rev": "6f231a42300bd08084f52cca55ca96207c68344e",
         "type": "github"
       },
       "original": {
@@ -968,6 +970,22 @@
         "type": "github"
       }
     },
+    "nvim-bnf-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1555099325,
+        "narHash": "sha256-zeW/2wIAwvxb/R8bXDjPEYvB8KWBDx6T0DcMH6NY2NU=",
+        "owner": "daskol",
+        "repo": "nvim-bnf",
+        "rev": "749aa45be562d4d24340719e66ae750001885f38",
+        "type": "github"
+      },
+      "original": {
+        "owner": "daskol",
+        "repo": "nvim-bnf",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix-flake": "agenix-flake",
@@ -1379,6 +1397,23 @@
         "id": "nixpkgs",
         "type": "indirect"
       }
+    },
+    "victoria-logs-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1728382879,
+        "narHash": "sha256-iaV4bjwjLqQcB//xIH16lRFry9ncxej+DLesb3pbm/4=",
+        "owner": "VictoriaMetrics",
+        "repo": "VictoriaMetrics",
+        "rev": "6878982c93e34a2bf6ab026b3809073b284b6afc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "VictoriaMetrics",
+        "ref": "v0.34.0-victorialogs",
+        "repo": "VictoriaMetrics",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index b9ab578..6f84e2f 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -98,6 +98,8 @@
         };
         neogit-nvim = custom-flakes.packages."${system}".neogit-nvim;
         d2-vim = custom-flakes.packages."${system}".d2-vim;
+        # TODO(zaphar): Apparently this is a remote plugin so it needs some additional love.
+        #nvim-bnf = custom-flakes.packages."${system}".nvim-bnf;
         nvim-treesitter-context = custom-flakes.packages."${system}".nvim-treesitter-context;
         roslyn-nvim = custom-flakes.packages."${system}".roslyn-nvim;
         nvim = neovim-flake.packages."${system}".neovim;
@@ -156,9 +158,11 @@ EOF";
                 lualine-lsp-progress
                 lean-nvim
                 roslyn-nvim
+                #nvim-bnf
                 nvim-treesitter-context
                 nvim-treesitter-textobjects
 				nvim-treesitter-parsers.ini
+				nvim-treesitter-parsers.ebnf
 				nvim-treesitter-parsers.rust
 				nvim-treesitter-parsers.c
 				#nvim-treesitter-parsers.c_sharp # currently broken for some reason
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index 1eb2337..a963dcf 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -72,6 +72,14 @@ vim.cmd([[
 au BufNewFile,BufRead *.hrl filetype indent off
 ]])
 
+vim.cmd([[
+au BufNewFile,BufRead *.nix set tabstop=2 nosmarttab 
+]])
+
+vim.cmd([[
+au BufNewFile,BufRead *.ebnf set filetype=ebnf
+]])
+
 
 -- Telelscope Imports
 local telescope = require('telescope')