mirror of
https://github.com/NotAShelf/neovim-flake.git
synced 2024-11-09 14:45:58 +01:00
Merge branch 'NotAShelf:main' into cokeline
This commit is contained in:
commit
ff7aee90ce
9 changed files with 13 additions and 11 deletions
|
@ -47,3 +47,5 @@ Release notes for release 0.7
|
||||||
[jacekpoz](https://github.com/jacekpoz):
|
[jacekpoz](https://github.com/jacekpoz):
|
||||||
|
|
||||||
- Add [ocaml-lsp](https://github.com/ocaml/ocaml-lsp) support.
|
- Add [ocaml-lsp](https://github.com/ocaml/ocaml-lsp) support.
|
||||||
|
|
||||||
|
- Fix Emac typo
|
||||||
|
|
|
@ -114,11 +114,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716749035,
|
"lastModified": 1717839683,
|
||||||
"narHash": "sha256-mdBp0b4VIQ71aUK2uBRROUkENk93RUUubjlQkvskNO0=",
|
"narHash": "sha256-kC0eyEsfpXbtQ2Ee5kgjmLFSVsLgnqpj10LjEi+fK+g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b5995681aa319d0e33a6d83a31710d6c6f092820",
|
"rev": "3f3a01219b4a1b6ee63039a3aa63948fbf37c0dd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
neovim-flake =
|
neovim-flake =
|
||||||
nixpkgs.lib.warn ''
|
nixpkgs.lib.warn ''
|
||||||
homeManagerModules.neovim-flake has been deprecated.
|
homeManagerModules.neovim-flake has been deprecated.
|
||||||
Plese use the homeManagereModules.nvf instead
|
Plese use the homeManagerModules.nvf instead
|
||||||
''
|
''
|
||||||
self.homeManagerModules.nvf;
|
self.homeManagerModules.nvf;
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
defaultServer = "vscode-langservers-extracted";
|
defaultServer = "vscode-langservers-extracted";
|
||||||
servers = {
|
servers = {
|
||||||
vscode-langservers-extracted = {
|
vscode-langservers-extracted = {
|
||||||
package = pkgs.nodePackages.vscode-langservers-extracted;
|
package = pkgs.vscode-langservers-extracted;
|
||||||
lspConfig = ''
|
lspConfig = ''
|
||||||
-- enable (broadcasting) snippet capability for completion
|
-- enable (broadcasting) snippet capability for completion
|
||||||
-- see <https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#cssls>
|
-- see <https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#cssls>
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
defaultServer = "pyright";
|
defaultServer = "pyright";
|
||||||
servers = {
|
servers = {
|
||||||
pyright = {
|
pyright = {
|
||||||
package = pkgs.nodePackages.pyright;
|
package = pkgs.pyright;
|
||||||
lspConfig = ''
|
lspConfig = ''
|
||||||
lspconfig.pyright.setup{
|
lspconfig.pyright.setup{
|
||||||
capabilities = capabilities;
|
capabilities = capabilities;
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
defaultDiagnosticsProvider = ["eslint_d"];
|
defaultDiagnosticsProvider = ["eslint_d"];
|
||||||
diagnosticsProviders = {
|
diagnosticsProviders = {
|
||||||
eslint_d = {
|
eslint_d = {
|
||||||
package = pkgs.nodePackages.eslint_d;
|
package = pkgs.eslint_d;
|
||||||
nullConfig = pkg: ''
|
nullConfig = pkg: ''
|
||||||
table.insert(
|
table.insert(
|
||||||
ls_sources,
|
ls_sources,
|
||||||
|
|
|
@ -80,7 +80,7 @@
|
||||||
defaultDiagnosticsProvider = ["eslint_d"];
|
defaultDiagnosticsProvider = ["eslint_d"];
|
||||||
diagnosticsProviders = {
|
diagnosticsProviders = {
|
||||||
eslint_d = {
|
eslint_d = {
|
||||||
package = pkgs.nodePackages.eslint_d;
|
package = pkgs.eslint_d;
|
||||||
nullConfig = pkg: ''
|
nullConfig = pkg: ''
|
||||||
table.insert(
|
table.insert(
|
||||||
ls_sources,
|
ls_sources,
|
||||||
|
|
|
@ -15,7 +15,7 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
options.vim.notes.orgmode = {
|
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" {
|
setupOpts = mkPluginSetupOption "Orgmode" {
|
||||||
org_agenda_files = mkOption {
|
org_agenda_files = mkOption {
|
||||||
|
|
|
@ -4,14 +4,14 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.options) mkEnableOption mkOption;
|
inherit (lib.options) mkEnableOption mkOption;
|
||||||
inherit (lib.types) attrsOf str;
|
inherit (lib.types) attrsOf nullOr str;
|
||||||
in {
|
in {
|
||||||
options.vim.binds.whichKey = {
|
options.vim.binds.whichKey = {
|
||||||
enable = mkEnableOption "which-key keybind helper menu";
|
enable = mkEnableOption "which-key keybind helper menu";
|
||||||
|
|
||||||
register = mkOption {
|
register = mkOption {
|
||||||
description = "Register label for which-key keybind helper menu";
|
description = "Register label for which-key keybind helper menu";
|
||||||
type = attrsOf str;
|
type = attrsOf (nullOr str);
|
||||||
default = {};
|
default = {};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue