Merge branch 'NotAShelf:main' into cokeline

which-key: allow null in registers

docs/release-notes/rl-0.7.md

@@ -47,3 +47,5 @@ Release notes for release 0.7
 [jacekpoz](https://github.com/jacekpoz):
 
 - Add [ocaml-lsp](https://github.com/ocaml/ocaml-lsp) support.
+
+- Fix Emac typo

flake.lock

@@ -114,11 +114,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716749035,
-        "narHash": "sha256-mdBp0b4VIQ71aUK2uBRROUkENk93RUUubjlQkvskNO0=",
+        "lastModified": 1717839683,
+        "narHash": "sha256-kC0eyEsfpXbtQ2Ee5kgjmLFSVsLgnqpj10LjEi+fK+g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b5995681aa319d0e33a6d83a31710d6c6f092820",
+        "rev": "3f3a01219b4a1b6ee63039a3aa63948fbf37c0dd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -30,7 +30,7 @@
           neovim-flake =
             nixpkgs.lib.warn ''
               homeManagerModules.neovim-flake has been deprecated.
-              Plese use the homeManagereModules.nvf instead
+              Plese use the homeManagerModules.nvf instead
             ''
             self.homeManagerModules.nvf;
 

modules/plugins/languages/css.nix

@@ -17,7 +17,7 @@
   defaultServer = "vscode-langservers-extracted";
   servers = {
     vscode-langservers-extracted = {
-      package = pkgs.nodePackages.vscode-langservers-extracted;
+      package = pkgs.vscode-langservers-extracted;
       lspConfig = ''
         -- enable (broadcasting) snippet capability for completion
         -- see <https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#cssls>

modules/plugins/languages/python.nix

@@ -17,7 +17,7 @@
   defaultServer = "pyright";
   servers = {
     pyright = {
-      package = pkgs.nodePackages.pyright;
+      package = pkgs.pyright;
       lspConfig = ''
         lspconfig.pyright.setup{
           capabilities = capabilities;

modules/plugins/languages/svelte.nix

@@ -54,7 +54,7 @@
   defaultDiagnosticsProvider = ["eslint_d"];
   diagnosticsProviders = {
     eslint_d = {
-      package = pkgs.nodePackages.eslint_d;
+      package = pkgs.eslint_d;
       nullConfig = pkg: ''
         table.insert(
           ls_sources,

modules/plugins/languages/ts.nix

@@ -80,7 +80,7 @@
   defaultDiagnosticsProvider = ["eslint_d"];
   diagnosticsProviders = {
     eslint_d = {
-      package = pkgs.nodePackages.eslint_d;
+      package = pkgs.eslint_d;
       nullConfig = pkg: ''
         table.insert(
           ls_sources,

modules/plugins/notes/orgmode/orgmode.nix

@@ -15,7 +15,7 @@ in {
   ];
 
   options.vim.notes.orgmode = {
-    enable = mkEnableOption "nvim-orgmode: Neovim plugin for Emac Orgmode. Get the best of both worlds";
+    enable = mkEnableOption "nvim-orgmode: Neovim plugin for Emacs Orgmode. Get the best of both worlds";
 
     setupOpts = mkPluginSetupOption "Orgmode" {
       org_agenda_files = mkOption {

modules/plugins/utility/binds/which-key/which-key.nix

@@ -4,14 +4,14 @@
   ...
 }: let
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) attrsOf str;
+  inherit (lib.types) attrsOf nullOr str;
 in {
   options.vim.binds.whichKey = {
     enable = mkEnableOption "which-key keybind helper menu";
 
     register = mkOption {
       description = "Register label for which-key keybind helper menu";
-      type = attrsOf str;
+      type = attrsOf (nullOr str);
       default = {};
     };
   };