dev: cleanup

modules/filetree/nvimtree/config.nix

@@ -24,47 +24,9 @@ in {
     ];
 
     vim.luaConfigRC.nvimtreelua = nvim.dag.entryAnywhere ''
-      ${
-        lib.optionalString (cfg.openOnSetup) ''
-          -- Open on startup has been deprecated
-          -- see https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup
-
-          -- use a nix eval to dynamically insert the open on startup function
-          local function open_nvim_tree(data)
-            local IGNORED_FT = {
-              "markdown",
-            }
-
-            -- buffer is a real file on the disk
-            local real_file = vim.fn.filereadable(data.file) == 1
-
-            -- buffer is a [No Name]
-              local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
-
-            -- &ft
-            local filetype = vim.bo[data.buf].ft
-
-            -- only files please
-            if not real_file and not no_name then
-              return
-            end
-
-            -- skip ignored filetypes
-            if vim.tbl_contains(IGNORED_FT, filetype) then
-              return
-            end
-
-            -- open the tree but don't focus it
-            require("nvim-tree.api").tree.toggle({ focus = false })
-          end
-
-          -- function to automatically open the tree on VimEnter
-          vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
-        ''
-      }
-
       ${
         lib.optionalString (cfg.disableNetrw) ''
+          -- disable netrew completely
           vim.g.loaded_netrw = 1
           vim.g.loaded_netrwPlugin = 1
         ''
@@ -301,6 +263,46 @@ in {
           },
         },
       })
+
+      -- autostart behaviour
+      ${
+        lib.optionalString (cfg.openOnSetup) ''
+          -- Open on startup has been deprecated
+          -- see https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup
+
+          -- use a nix eval to dynamically insert the open on startup function
+          local function open_nvim_tree(data)
+            local IGNORED_FT = {
+              "markdown",
+            }
+
+            -- buffer is a real file on the disk
+            local real_file = vim.fn.filereadable(data.file) == 1
+
+            -- buffer is a [No Name]
+              local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
+
+            -- &ft
+            local filetype = vim.bo[data.buf].ft
+
+            -- only files please
+            if not real_file and not no_name then
+              return
+            end
+
+            -- skip ignored filetypes
+            if vim.tbl_contains(IGNORED_FT, filetype) then
+              return
+            end
+
+            -- open the tree but don't focus it
+            require("nvim-tree.api").tree.toggle({ focus = false })
+          end
+
+          -- function to automatically open the tree on VimEnter
+          vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
+        ''
+      }
     '';
   };
 }

modules/filetree/nvimtree/nvimtree.nix

@@ -260,10 +260,12 @@ with builtins; {
 
           severity = mkOption {
             description = "Severity for which the diagnostics will be displayed. See `:help diagnostic-severity`";
+
             default = {
               min = "HINT";
               max = "ERROR";
             };
+
             type = types.submodule {
               options = {
                 min = mkOption {
@@ -306,7 +308,7 @@ with builtins; {
         '';
       };
 
-      timeOut = mkOption {
+      timeout = mkOption {
         type = types.int;
         default = 400;
         description = ''
@@ -472,6 +474,7 @@ with builtins; {
 
           float = mkOption {
             description = "Configuration options for floating window.";
+
             default = {
               enable = false;
               quitOnFocusLoss = true;