mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-01-16 15:30:50 +00:00
Compare commits
No commits in common. "f192344f7d4f262fd5dcb868fd32b8789c7f0882" and "8f7d2181ae9627d09071404341bbcf7e428e65c4" have entirely different histories.
f192344f7d
...
8f7d2181ae
6 changed files with 36 additions and 49 deletions
1
.github/workflows/cachix.yml
vendored
1
.github/workflows/cachix.yml
vendored
|
|
@ -35,6 +35,7 @@ jobs:
|
||||||
|
|
||||||
- name: Install Nix
|
- name: Install Nix
|
||||||
uses: DeterminateSystems/nix-installer-action@main
|
uses: DeterminateSystems/nix-installer-action@main
|
||||||
|
- uses: DeterminateSystems/magic-nix-cache-action@main
|
||||||
|
|
||||||
- uses: cachix/cachix-action@v15
|
- uses: cachix/cachix-action@v15
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,3 @@
|
||||||
|
|
||||||
- Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter. Code
|
- Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter. Code
|
||||||
Inspiration from `vim.languages.clang.dap` implementation.
|
Inspiration from `vim.languages.clang.dap` implementation.
|
||||||
|
|
||||||
[nezia1](https://github.com/nezia1)
|
|
||||||
|
|
||||||
- Add support for [nixd](https://github.com/nix-community/nixd) language server.
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
inherit (lib.nvim.config) batchRenameOptions;
|
inherit (lib.nvim.config) batchRenameOptions;
|
||||||
|
|
||||||
renamedVimOpts = batchRenameOptions ["vim"] ["vim" "options"] {
|
renamedVimOpts = batchRenameOptions ["vim"] ["vim" "options"] {
|
||||||
# 2024-12-01
|
|
||||||
colourTerm = "termguicolors";
|
colourTerm = "termguicolors";
|
||||||
mouseSupport = "mouse";
|
mouseSupport = "mouse";
|
||||||
cmdHeight = "cmdheight";
|
cmdHeight = "cmdheight";
|
||||||
|
|
@ -16,9 +15,6 @@
|
||||||
autoIndent = "autoindent";
|
autoIndent = "autoindent";
|
||||||
wordWrap = "wrap";
|
wordWrap = "wrap";
|
||||||
showSignColumn = "signcolumn";
|
showSignColumn = "signcolumn";
|
||||||
|
|
||||||
# 2025-02-07
|
|
||||||
scrollOff = "scrolloff";
|
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
imports = concatLists [
|
imports = concatLists [
|
||||||
|
|
@ -97,15 +93,9 @@ in {
|
||||||
|
|
||||||
# 2024-12-02
|
# 2024-12-02
|
||||||
(mkRenamedOptionModule ["vim" "enableEditorconfig"] ["vim" "globals" "editorconfig"])
|
(mkRenamedOptionModule ["vim" "enableEditorconfig"] ["vim" "globals" "editorconfig"])
|
||||||
|
|
||||||
# 2025-02-06
|
|
||||||
(mkRemovedOptionModule ["vim" "disableArrows"] ''
|
|
||||||
Top-level convenience options are now in the process of being removed from nvf as
|
|
||||||
their behaviour was abstract, and confusing. Please use 'vim.options' or 'vim.luaConfigRC'
|
|
||||||
to replicate previous behaviour.
|
|
||||||
'')
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# 2024-12-01
|
||||||
# Migrated via batchRenameOptions. Further batch renames must be below this line.
|
# Migrated via batchRenameOptions. Further batch renames must be below this line.
|
||||||
renamedVimOpts
|
renamedVimOpts
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,12 @@
|
||||||
cfg = config.vim;
|
cfg = config.vim;
|
||||||
in {
|
in {
|
||||||
options.vim = {
|
options.vim = {
|
||||||
|
disableArrows = mkOption {
|
||||||
|
type = bool;
|
||||||
|
default = false;
|
||||||
|
description = "Set to prevent arrow keys from moving cursor";
|
||||||
|
};
|
||||||
|
|
||||||
hideSearchHighlight = mkOption {
|
hideSearchHighlight = mkOption {
|
||||||
type = bool;
|
type = bool;
|
||||||
default = false;
|
default = false;
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,34 @@
|
||||||
in {
|
in {
|
||||||
config = {
|
config = {
|
||||||
vim.keymaps = mkMerge [
|
vim.keymaps = mkMerge [
|
||||||
|
(
|
||||||
|
mkIf cfg.disableArrows [
|
||||||
|
{
|
||||||
|
key = "<up>";
|
||||||
|
mode = ["n" "i"];
|
||||||
|
action = "<nop>";
|
||||||
|
noremap = false;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<down>";
|
||||||
|
mode = ["n" "i"];
|
||||||
|
action = "<nop>";
|
||||||
|
noremap = false;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<left>";
|
||||||
|
mode = ["n" "i"];
|
||||||
|
action = "<nop>";
|
||||||
|
noremap = false;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "<right>";
|
||||||
|
mode = ["n" "i"];
|
||||||
|
action = "<nop>";
|
||||||
|
noremap = false;
|
||||||
|
}
|
||||||
|
]
|
||||||
|
)
|
||||||
(
|
(
|
||||||
pipe cfg.maps
|
pipe cfg.maps
|
||||||
[
|
[
|
||||||
|
|
|
||||||
|
|
@ -59,40 +59,6 @@
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
nixd = {
|
|
||||||
package = pkgs.nixd;
|
|
||||||
internalFormatter = true;
|
|
||||||
lspConfig = ''
|
|
||||||
lspconfig.nixd.setup{
|
|
||||||
capabilities = capabilities,
|
|
||||||
${
|
|
||||||
if cfg.format.enable
|
|
||||||
then useFormat
|
|
||||||
else noFormat
|
|
||||||
},
|
|
||||||
cmd = ${packageToCmd cfg.lsp.package "nixd"},
|
|
||||||
${optionalString cfg.format.enable ''
|
|
||||||
settings = {
|
|
||||||
nixd = {
|
|
||||||
${optionalString (cfg.format.type == "alejandra")
|
|
||||||
''
|
|
||||||
formatting = {
|
|
||||||
command = {"${cfg.format.package}/bin/alejandra", "--quiet"},
|
|
||||||
},
|
|
||||||
''}
|
|
||||||
${optionalString (cfg.format.type == "nixfmt")
|
|
||||||
''
|
|
||||||
formatting = {
|
|
||||||
command = {"${cfg.format.package}/bin/nixfmt"},
|
|
||||||
},
|
|
||||||
''}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
''}
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
defaultFormat = "alejandra";
|
defaultFormat = "alejandra";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue