Merge 5ce1d90e95 into 46aa168b2d

docs/release-notes/rl-0.8.md

@@ -18,6 +18,3 @@
 [diniamo](https://github.com/diniamo):
 
 - Add Odin support under `vim.languages.odin`.
-
-- Disable the built-in format-on-save feature of zls. Use `vim.lsp.formatOnSave`
-  instead.

flake.lock

@@ -1729,11 +1729,11 @@
     "plugin-run-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1735130195,
+        "lastModified": 1734816675,
-        "narHash": "sha256-OaOSYyXSNCl9kJJVKhy0L4M06CQFc0NtZ8+AIgKBPik=",
+        "narHash": "sha256-Wuk5HG+vHXAbifzp5YB5V/FxBhBRNWLeypkRczpXbvQ=",
         "owner": "diniamo",
         "repo": "run.nvim",
-        "rev": "5888f31c5faf4776e598c0665470f5445510c59e",
+        "rev": "6cd971afdce6443d7a070dcc23af51da1cc932f9",
         "type": "github"
       },
       "original": {

modules/plugins/filetree/nvimtree/config.nix

@@ -77,9 +77,6 @@ in {
               -- buffer is a real file on the disk
               local real_file = vim.fn.filereadable(data.file) == 1
 
-              -- buffer is a directory
-              local directory = vim.fn.isdirectory(data.file) == 1
-
               -- buffer is a [No Name]
                 local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
 
@@ -87,7 +84,7 @@ in {
               local filetype = vim.bo[data.buf].ft
 
               -- only files please
-              if not real_file and not directory and not no_name then
+              if not real_file and not no_name then
                 return
               end
 
@@ -96,10 +93,6 @@ in {
                 return
               end
 
-              -- cd if buffer is a directory
-              if directory then
-                vim.cmd.cd(data.file)
-              end
               -- open the tree but don't focus it
               require("nvim-tree.api").tree.toggle({ focus = false })
             end

modules/plugins/languages/zig.nix

@@ -6,7 +6,7 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.modules) mkIf mkMerge mkDefault;
+  inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.types) either listOf package str enum;
   inherit (lib.nvim.lua) expToLua;
@@ -60,22 +60,13 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      vim.treesitter = {
+      vim.treesitter.enable = true;
-        enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
-        grammars = [cfg.treesitter.package];
-      };
     })
 
     (mkIf cfg.lsp.enable {
-      vim = {
+      vim.lsp.lspconfig.enable = true;
-        lsp.lspconfig = {
+      vim.lsp.lspconfig.sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
-          enable = true;
-          sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
-        };
-
-        # nvf handles autosaving already
-        globals.zig_fmt_autosave = mkDefault 0;
-      };
     })
   ]);
 }

modules/plugins/runner/run-nvim/config.nix

@@ -20,9 +20,17 @@ in {
         cmd = "Run";
 
         keys = [
-          (mkKeymap "n" cfg.mappings.run "<cmd>Run<cr>" {desc = mappings.run.description;})
+          (mkKeymap "n" cfg.mappings.run "<cmd>Run<CR>" {desc = mappings.run.description;})
-          (mkKeymap "n" cfg.mappings.runOverride "<cmd>Run!<cr>" {desc = mappings.runOverride.description;})
+          (mkKeymap "n" cfg.mappings.runOverride "<cmd>Run!<CR>" {desc = mappings.runOverride.description;})
-          (mkKeymap "n" cfg.mappings.runCommand "<cmd>RunPrompt<cr>" {desc = mappings.run.description;})
+          (mkKeymap "n" cfg.mappings.runCommand ''
+              function()
+                local input = vim.fn.input("Run command: ")
+                if input ~= "" then require("run").run(input, false) end
+              end
+            '' {
+              desc = mappings.run.description;
+              lua = true;
+            })
         ];
       };
 

modules/plugins/ui/notifications/nvim-notify/config.nix

@@ -16,7 +16,7 @@ in {
       pluginRC.nvim-notify = entryAnywhere ''
         local notify = require("notify")
         notify.setup(${toLuaObject cfg.setupOpts})
-        vim.notify = notify.notify
+        vim.notify = notify
       '';
     };
   };