From 8eb8326bd628eb62100b022bca6c77723e48294d Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Sat, 8 Jun 2024 17:58:08 +0200 Subject: [PATCH 1/6] plugins/orgmode: fix typo --- docs/release-notes/rl-0.7.md | 2 ++ modules/plugins/notes/orgmode/orgmode.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index ca49c7d..5d15013 100644 --- a/docs/release-notes/rl-0.7.md +++ b/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 diff --git a/modules/plugins/notes/orgmode/orgmode.nix b/modules/plugins/notes/orgmode/orgmode.nix index 1dad458..fe2c4be 100644 --- a/modules/plugins/notes/orgmode/orgmode.nix +++ b/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 { From c50522f6b04b5c26e1606af12fc3141bc0db1e07 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 8 Jun 2024 19:42:05 +0300 Subject: [PATCH 2/6] languages: avoid using package aliases --- modules/plugins/languages/css.nix | 2 +- modules/plugins/languages/svelte.nix | 2 +- modules/plugins/languages/ts.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix index 748b82d..1535eca 100644 --- a/modules/plugins/languages/css.nix +++ b/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 diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index 599686e..e6c9d62 100644 --- a/modules/plugins/languages/svelte.nix +++ b/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, diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index ac77f54..139c409 100644 --- a/modules/plugins/languages/ts.nix +++ b/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, From 68b0647936a6e8c79b8b93500b33ba981c802609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phan=20=C4=90=C4=83ng=20Khoa?= Date: Sun, 9 Jun 2024 15:57:55 +0700 Subject: [PATCH 3/6] languages: changed python lsp package to pyright --- modules/plugins/languages/python.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix index d9df6bf..a113a6c 100644 --- a/modules/plugins/languages/python.nix +++ b/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; From dfa2718bb301a733b2de9c06fbca3ff46dcf1446 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 9 Jun 2024 12:07:26 +0300 Subject: [PATCH 4/6] flake: bump nixpkgs input --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cb776a8..d48bdb8 100644 --- a/flake.lock +++ b/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": { From 9cff1b03d675912b17d7f32d41a6164129c3e32f Mon Sep 17 00:00:00 2001 From: diniamo Date: Mon, 10 Jun 2024 09:33:45 +0200 Subject: [PATCH 5/6] flake: fix typo --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 88f5615..43fa890 100644 --- a/flake.nix +++ b/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; From a437dbd158c78c4471bfab08f74303d318efc668 Mon Sep 17 00:00:00 2001 From: diniamo Date: Wed, 12 Jun 2024 01:24:03 +0200 Subject: [PATCH 6/6] which-key: allow null in registers --- modules/plugins/utility/binds/which-key/which-key.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/plugins/utility/binds/which-key/which-key.nix b/modules/plugins/utility/binds/which-key/which-key.nix index 796dc8e..feb8d76 100644 --- a/modules/plugins/utility/binds/which-key/which-key.nix +++ b/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 = {}; }; };