chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

home/{kakoune,helix}: small maintenance

Browse source
This commit is contained in:
chayleaf 2023-06-29 08:17:19 +07:00
parent f1f95891c7
commit 32b448eda6
2 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
home/common/helix.nix
View file

@ -1,6 +1,6 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
wrapHelix = { extraPackages ? [ ], withPython3 ? true, extraPython3Packages ? (_: []) }: wrapHelix = { extraPackages ? [ ], withPython3 ? true, extraPython3Packages ? (_: [ ]) }:
pkgs.symlinkJoin { pkgs.symlinkJoin {
postBuild = '' postBuild = ''
rm $out/bin/hx rm $out/bin/hx
@ -28,9 +28,14 @@ in {
]; ];
extraPython3Packages = (pypkgs: with pypkgs; [ python-lsp-server ]); extraPython3Packages = (pypkgs: with pypkgs; [ python-lsp-server ]);
}; };
# languages = []; # languages = [ ];
settings = { settings = {
theme = "base16_terminal"; theme = "base16_terminal";
editor.cursor-shape = {
insert = "bar";
normal = "block";
select = "block";
};
}; };
}; };
} }

55
home/common/kakoune.nix
View file

@ -1,6 +1,6 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
wrapKakoune = { extraPackages ? [ ], withPython3 ? true, extraPython3Packages ? (_: []) }: wrapKakoune = { extraPackages ? [ ], withPython3 ? true, extraPython3Packages ? (_: [ ]) }:
pkgs.symlinkJoin { pkgs.symlinkJoin {
postBuild = '' postBuild = ''
rm $out/bin/kak rm $out/bin/kak
@ -40,28 +40,35 @@ in {
''; '';
plugins = with pkgs.kakounePlugins; [ kak-lsp smarttab-kak tabs-kak ]; plugins = with pkgs.kakounePlugins; [ kak-lsp smarttab-kak tabs-kak ];
}; };
xdg.configFile."kak-lsp/kak-lsp.toml".text = '' xdg.configFile."kak-lsp/kak-lsp.toml".source = (pkgs.formats.toml { }).generate "kak-lsp.toml" {
language = {
# bash, clangd, json, html, css, python work out of the box # bash, clangd, json, html, css, python work out of the box
[language.rust] rust = {
filetypes = ["rust"] filetypes = [ "rust" ];
roots = ["rust-toolchain.toml", "rust-toolchain", "Cargo.toml"] roots = [ "rust-toolchain.toml" "rust-toolchain" "Cargo.toml" ];
command = "rust-analyzer" command = "rust-analyzer";
[language.typescript] };
filetypes = ["typescript"] typescript = {
roots = ["package.json"] filetypes = [ "typescript" ];
command = "typescript-language-server" roots = [ "package.json" ];
args = ["--stdio"] command = "typescript-language-server";
[language.nix] args = [ "--stdio" ];
filetypes = ["nix"] };
roots = ["flake.nix"] nix = {
command = "nil" filetypes = [ "nix" ];
[language.markdown] roots = [ "flake.nix" ];
filetypes = ["markdown"] command = "nil";
roots = [] };
command = "marksman" markdown = {
[language.toml] filetypes = [ "markdown" ];
filetypes = ["toml"] roots = [ ];
roots = [] command = "marksman";
command = "taplo" };
''; toml = {
filetypes = [ "toml" ];
roots = [ ];
command = "taplo";
};
};
};
} }