Cleaner kakoune configuration
This commit is contained in:
parent
a39ad62ae5
commit
3e95ab122d
9 changed files with 61 additions and 23 deletions
|
|
@ -1 +1,11 @@
|
||||||
{ pkgs, config, lib, ... }: { home.packages = with pkgs; lib.optionals config.programs.helix.enable [ clang-tools cmake-language-server ]; }
|
{ pkgs, config, lib, ... }: {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
|
||||||
|
] ++ lib.optionals config.programs.helix.enable [
|
||||||
|
clang-tools # C, CPP
|
||||||
|
cmake-language-server # CMAKE
|
||||||
|
] ++ lib.optionals config.programs.kakoune.enable [
|
||||||
|
clang-tools # C, CPP
|
||||||
|
cmake-language-server # CMAKE
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,5 +3,8 @@
|
||||||
nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS
|
nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS
|
||||||
yaml-language-server # YAML
|
yaml-language-server # YAML
|
||||||
taplo-cli # TOML
|
taplo-cli # TOML
|
||||||
|
] ++ lib.optionals config.programs.kakoune.enable [
|
||||||
|
nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS
|
||||||
|
yaml-language-server # YAML
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,12 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, lib, config, ... }: {
|
||||||
programs.go = {
|
programs.go = {
|
||||||
enable = true;
|
enable = true;
|
||||||
goPath = ".go";
|
goPath = ".go";
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [ gopls ];
|
home.packages = with pkgs; lib.optionals config.programs.helix.enable [
|
||||||
|
gopls
|
||||||
|
] ++ (lib.optionals config.programs.kakoune.enable [
|
||||||
|
gopls
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,10 @@
|
||||||
{ pkgs, lib, config, ... }: { home.packages = with pkgs; lib.optionals config.programs.helix.enable [ nodePackages.typescript-language-server ]; }
|
{ pkgs, lib, config, ... }: {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
|
||||||
|
] ++ lib.optionals config.programs.helix.enable [
|
||||||
|
nodePackages.typescript-language-server
|
||||||
|
] ++ lib.optionals config.programs.kakoune.enable [
|
||||||
|
nodePackages.typescript-language-server
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,5 +5,12 @@
|
||||||
texlive.combined.scheme-medium
|
texlive.combined.scheme-medium
|
||||||
] ++ lib.optionals config.programs.helix.enable [
|
] ++ lib.optionals config.programs.helix.enable [
|
||||||
texlab
|
texlab
|
||||||
|
] ++ lib.optionals config.programs.kakoune.enable [
|
||||||
|
texlab
|
||||||
|
aspell
|
||||||
|
aspellDicts.en
|
||||||
|
aspellDicts.en-computers
|
||||||
|
aspellDicts.en-science
|
||||||
|
aspellDicts.it
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,5 +6,7 @@
|
||||||
nix-tree
|
nix-tree
|
||||||
] ++ lib.optionals config.programs.helix.enable [
|
] ++ lib.optionals config.programs.helix.enable [
|
||||||
nil
|
nil
|
||||||
|
] ++ lib.optionals config.programs.kakoune.enable [
|
||||||
|
rnix-lsp
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,17 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, lib, config, ... }: {
|
||||||
home.packages = with pkgs;
|
home.packages = with pkgs; [
|
||||||
[ black ] ++ (with pkgs.python3Packages; [
|
black
|
||||||
python-lsp-server
|
] ++ lib.optionals config.programs.helix.enable [
|
||||||
# pyls-black # not updated to the new pylsp
|
python3Packages.python-lsp-server # PYLSP
|
||||||
pyls-flake8
|
# python3Packages.pyls-mypy # MYPY # NOT UPDATED
|
||||||
pyls-isort
|
python3Packages.pyls-flake8 # FLAKE8
|
||||||
]);
|
# python3Packages.pyls-black # BLACK # NOT UPDATED
|
||||||
|
python3Packages.pyls-isort # ISORT
|
||||||
|
] ++ lib.optionals config.programs.kakoune.enable [
|
||||||
|
python3Packages.python-lsp-server # PYLSP
|
||||||
|
# python3Packages.pyls-mypy # MYPY # NOT UPDATED
|
||||||
|
python3Packages.pyls-flake8 # FLAKE8
|
||||||
|
# python3Packages.pyls-black # BLACK # NOT UPDATED
|
||||||
|
python3Packages.pyls-isort # ISORT
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,5 +28,10 @@
|
||||||
cargo-workspaces
|
cargo-workspaces
|
||||||
clippy
|
clippy
|
||||||
rustfmt
|
rustfmt
|
||||||
] ++ (lib.optionals config.programs.helix.enable [ rust-analyzer ]);
|
] ++ lib.optionals config.programs.helix.enable [
|
||||||
|
rust-analyzer
|
||||||
|
] ++
|
||||||
|
lib.optionals config.programs.kakoune.enable [
|
||||||
|
rust-analyzer
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,15 +32,6 @@ let
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
editorconfig-core-c
|
editorconfig-core-c
|
||||||
nodePackages.vscode-langservers-extracted
|
|
||||||
rnix-lsp
|
|
||||||
yaml-language-server
|
|
||||||
|
|
||||||
aspell
|
|
||||||
aspellDicts.en
|
|
||||||
aspellDicts.en-computers
|
|
||||||
aspellDicts.en-science
|
|
||||||
aspellDicts.it
|
|
||||||
|
|
||||||
(pkgs.makeDesktopItem {
|
(pkgs.makeDesktopItem {
|
||||||
name = "Kakoune";
|
name = "Kakoune";
|
||||||
|
|
@ -205,7 +196,7 @@ in
|
||||||
# { mode = "normal"; docstring = "Search"; key = "/"; effect = "/(?i)"; }
|
# { mode = "normal"; docstring = "Search"; key = "/"; effect = "/(?i)"; }
|
||||||
# { mode = "normal"; docstring = "Reverse search"; key = "<a-/>"; effect = "<a-/>(?i)"; }
|
# { mode = "normal"; docstring = "Reverse search"; key = "<a-/>"; effect = "<a-/>(?i)"; }
|
||||||
];
|
];
|
||||||
hooks = with pkgs; [
|
hooks = [
|
||||||
{
|
{
|
||||||
name = "BufCreate";
|
name = "BufCreate";
|
||||||
option = ".*";
|
option = ".*";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue