some housecleaning

This commit is contained in:
cnst
2024-09-06 18:38:30 +02:00
parent a00bf4b815
commit d519bc624b
8 changed files with 107 additions and 25 deletions

View File

@@ -28,6 +28,7 @@ in {
color-modes = true;
scrolloff = 0;
cursorline = true;
completion-replace = true;
cursor-shape = {
insert = "bar";
normal = "block";
@@ -38,8 +39,36 @@ in {
cursor-line = "hint";
other-lines = "error";
};
lsp.display-inlay-hints = true;
statusline.center = ["position-percentage"];
lsp = {
display-messages = true;
display-inlay-hints = true;
};
gutters = ["diagnostics" "line-numbers" "spacer" "diff"];
statusline = {
separator = "of";
left = [
"mode"
"selections"
"file-type"
"register"
"spinner"
"diagnostics"
];
center = ["file-name"];
right = [
"file-encoding"
"file-line-ending"
"position-percentage"
"spacer"
"separator"
"total-line-numbers"
];
mode = {
normal = "NOR";
insert = "INS";
select = "SEL";
};
};
true-color = true;
whitespace.characters = {
newline = "";
@@ -70,8 +99,17 @@ in {
};
in {
normal = {
y = "yank_to_clipboard";
p = "paste_clipboard_after";
d = {
d = ["extend_to_line_bounds" "yank_main_selection_to_clipboard" "delete_selection"];
s = ["surround_delete"];
};
x = "delete_selection";
y = {
y = ["extend_to_line_bounds" "yank_main_selection_to_clipboard" "normal_mode" "collapse_selection"];
};
Y = ["extend_to_line_end" "yank_main_selection_to_clipboard" "collapse_selection"];
P = ["paste_clipboard_before" "collapse_selection"];
p = ["paste_clipboard_after" "collapse_selection"];
C-a = "select_all";
del = "delete_selection";
space = spaceMode;
@@ -79,9 +117,18 @@ in {
insert = {
C-v = "paste_clipboard_after";
C-c = "yank_to_clipboard";
C-x = "completion";
del = "delete_selection";
esc = ["collapse_selection" "normal_mode"];
};
select = {
space = spaceMode;
d = ["yank_main_selection_to_clipboard" "delete_selection"];
x = ["yank_main_selection_to_clipboard" "delete_selection"];
y = ["yank_main_selection_to_clipboard" "normal_mode" "flip_selections" "collapse_selection"];
Y = ["extend_to_line_bounds" "yank_main_selection_to_clipboard" "goto_line_start" "collapse_selection" "normal_mode"];
p = ["replace_selections_with_clipboard"];
P = ["paste_clipboard_before"];
};
};
};

View File

@@ -56,6 +56,16 @@
auto-format = true;
language-servers = ["dprint" "typescript-language-server"];
}
{
name = "nix";
auto-format = true;
file-types = ["nix"];
language-servers = ["nil"];
formatter = {
command = lib.getExe pkgs.alejandra;
args = ["-q"];
};
}
{
name = "json";
formatter = deno "json";
@@ -67,7 +77,7 @@
}
{
name = "python";
language-servers = ["pyright"];
language-servers = ["pylsp"];
formatter = {
command = lib.getExe pkgs.black;
args = ["-" "--quiet" "--line-length 100"];
@@ -100,6 +110,11 @@
++ prettierLangs langs;
language-server = {
gpt = {
command = "helix-gpt";
args = ["--copilotApiKey" "cat /run/agenix/helix-gpt"];
};
bash-language-server = {
command = lib.getExe pkgs.bash-language-server;
args = ["start"];
@@ -148,7 +163,6 @@
nil = {
command = lib.getExe pkgs.nil;
config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"];
};
pyright = {