Simplify helix config

This commit is contained in:
Daniel Flanagan 2023-10-26 14:58:03 -05:00
parent 9448da57f5
commit 4ce3f4efa8
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
2 changed files with 117 additions and 120 deletions

View file

@ -9,113 +9,113 @@
package = inputs.helix.packages.${system}.helix; package = inputs.helix.packages.${system}.helix;
languages = { languages = {
language-server = { language-server = {
lexical = { # lexical = {
command = "lexical"; # command = "lexical";
args = ["start"]; # args = ["start"];
}; # };
next-ls = { # next-ls = {
command = "next-ls"; # command = "next-ls";
args = ["--stdout"]; # args = ["--stdout"];
}; # };
deno = { # deno = {
command = "deno"; # command = "deno";
args = ["lsp"]; # args = ["lsp"];
config = { # config = {
enable = true; # enable = true;
lint = true; # lint = true;
unstable = true; # unstable = true;
}; # };
}; # };
}; };
language = [ language = [
{ # {
name = "elixir"; # name = "elixir";
language-servers = ["elixir-ls"]; # "lexical" "next-ls" # language-servers = ["elixir-ls"]; # "lexical" "next-ls"
auto-format = true; # auto-format = true;
} # }
{ # {
name = "html"; # name = "html";
auto-format = false; # auto-format = false;
} # }
{ # {
name = "nix"; # name = "nix";
auto-format = true; # auto-format = true;
formatter = { # formatter = {
command = "alejandra"; # command = "alejandra";
args = ["-"]; # args = ["-"];
}; # };
} # }
{ # {
name = "fish"; # name = "fish";
auto-format = true; # auto-format = true;
indent = { # indent = {
tab-width = 2; # tab-width = 2;
unit = "\t"; # unit = "\t";
}; # };
} # }
{ # {
name = "javascript"; # name = "javascript";
language-id = "javascript"; # language-id = "javascript";
grammar = "javascript"; # grammar = "javascript";
scope = "source.js"; # scope = "source.js";
injection-regex = "^(js|javascript)$"; # injection-regex = "^(js|javascript)$";
file-types = ["js" "mjs"]; # file-types = ["js" "mjs"];
shebangs = ["deno"]; # shebangs = ["deno"];
language-servers = ["deno"]; # language-servers = ["deno"];
roots = ["deno.jsonc" "deno.json"]; # roots = ["deno.jsonc" "deno.json"];
formatter = { # formatter = {
command = "deno"; # command = "deno";
args = ["fmt"]; # args = ["fmt"];
}; # };
auto-format = true; # auto-format = true;
comment-token = "//"; # comment-token = "//";
indent = { # indent = {
tab-width = 2; # tab-width = 2;
unit = "\t"; # unit = "\t";
}; # };
} # }
{ # {
name = "typescript"; # name = "typescript";
language-id = "typescript"; # language-id = "typescript";
grammar = "typescript"; # grammar = "typescript";
scope = "source.ts"; # scope = "source.ts";
injection-regex = "^(ts|typescript)$"; # injection-regex = "^(ts|typescript)$";
file-types = ["ts"]; # file-types = ["ts"];
shebangs = ["deno"]; # shebangs = ["deno"];
language-servers = ["deno"]; # language-servers = ["deno"];
roots = ["deno.jsonc" "deno.json"]; # roots = ["deno.jsonc" "deno.json"];
formatter = { # formatter = {
command = "deno"; # command = "deno";
args = ["fmt"]; # args = ["fmt"];
}; # };
auto-format = true; # auto-format = true;
comment-token = "//"; # comment-token = "//";
indent = { # indent = {
tab-width = 2; # tab-width = 2;
unit = "\t"; # unit = "\t";
}; # };
} # }
{ # {
name = "jsonc"; # name = "jsonc";
language-id = "json"; # language-id = "json";
grammar = "jsonc"; # grammar = "jsonc";
scope = "source.jsonc"; # scope = "source.jsonc";
injection-regex = "^(jsonc)$"; # injection-regex = "^(jsonc)$";
roots = ["deno.jsonc" "deno.json"]; # roots = ["deno.jsonc" "deno.json"];
file-types = ["jsonc"]; # file-types = ["jsonc"];
language-servers = ["deno"]; # language-servers = ["deno"];
indent = { # indent = {
tab-width = 2; # tab-width = 2;
unit = " "; # unit = " ";
}; # };
auto-format = true; # auto-format = true;
} # }
/* /*
[[language]] [[language]]
@ -164,12 +164,12 @@
editor = { editor = {
soft-wrap.enable = true; soft-wrap.enable = true;
auto-pairs = true; # auto-pairs = true;
auto-save = false; # auto-save = false;
completion-trigger-len = 1; # completion-trigger-len = 1;
color-modes = false; # color-modes = false;
bufferline = "multiple"; bufferline = "multiple";
scrolloff = 8; # scrolloff = 8;
rulers = [80 120]; rulers = [80 120];
cursorline = true; cursorline = true;
@ -179,21 +179,21 @@
select = "underline"; select = "underline";
}; };
file-picker.hidden = false; # file-picker.hidden = false;
indent-guides = { indent-guides = {
render = true; render = true;
character = ""; character = "";
}; };
lsp = { # lsp = {
display-messages = true; # display-messages = true;
display-inlay-hints = true; # display-inlay-hints = true;
}; # };
statusline = { # statusline = {
left = ["mode" "spinner" "selections" "primary-selection-length" "position" "position-percentage" "diagnostics" "workspace-diagnostics"]; # left = ["mode" "spinner" "selections" "primary-selection-length" "position" "position-percentage" "diagnostics" "workspace-diagnostics"];
center = ["file-name"]; # center = ["file-name"];
right = ["version-control" "total-line-numbers" "file-encoding"]; # right = ["version-control" "total-line-numbers" "file-encoding"];
}; # };
}; };
keys = { keys = {
insert = { insert = {
@ -206,18 +206,15 @@
}; };
normal = { normal = {
D = "kill_to_line_end";
"^" = "goto_line_start";
"C-k" = "jump_view_up"; "C-k" = "jump_view_up";
"C-j" = "jump_view_down"; "C-j" = "jump_view_down";
"C-h" = "jump_view_left"; "C-h" = "jump_view_left";
"C-l" = "jump_view_right"; "C-l" = "jump_view_right";
"C-q" = ":quit-all!"; "C-q" = ":quit-all!";
"L" = "repeat_last_motion"; # "L" = "repeat_last_motion";
space = { space = {
q = ":reflow 80"; q = ":reflow 80";
Q = ":reflow 120"; Q = ":reflow 120";
v = ":run-shell-command fish -c 'env > /tmp/env'";
C = ":bc!"; C = ":bc!";
h = ":toggle lsp.display-inlay-hints"; h = ":toggle lsp.display-inlay-hints";
# O = ["select_textobject_inner WORD", ":pipe-to xargs xdg-open"]; # O = ["select_textobject_inner WORD", ":pipe-to xargs xdg-open"];
@ -229,7 +226,7 @@
q = ":reflow 80"; q = ":reflow 80";
Q = ":reflow 120"; Q = ":reflow 120";
}; };
"L" = "repeat_last_motion"; # "L" = "repeat_last_motion";
}; };
}; };
}; };

View file

@ -44,7 +44,7 @@
services.printing.enable = true; services.printing.enable = true;
services.fprintd = { services.fprintd = {
enable = true; enable = true;
tod.enable = true; # tod.enable = true;
# tod.driver = pkgs.libfprint-2-tod1-goodix; # tod.driver = pkgs.libfprint-2-tod1-goodix;
}; };
services.power-profiles-daemon.enable = false; services.power-profiles-daemon.enable = false;