Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
840e93de8a
2 changed files with 40 additions and 74 deletions
|
@ -9,10 +9,10 @@
|
||||||
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";
|
||||||
|
@ -31,31 +31,31 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
language = [
|
language = [
|
||||||
# {
|
{
|
||||||
# name = "elixir";
|
name = "elixir";
|
||||||
# language-servers = ["elixir-ls"]; # "lexical" "next-ls"
|
language-servers = ["lexical"]; # "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";
|
||||||
|
@ -116,46 +116,6 @@
|
||||||
# };
|
# };
|
||||||
# auto-format = true;
|
# auto-format = true;
|
||||||
# }
|
# }
|
||||||
|
|
||||||
/*
|
|
||||||
[[language]]
|
|
||||||
name = "jsx"
|
|
||||||
scope = "source.jsx"
|
|
||||||
injection-regex = "jsx"
|
|
||||||
file-types = ["jsx"]
|
|
||||||
shebangs = ["deno", "node"]
|
|
||||||
roots = ["deno.jsonc", "deno.json", "package.json", "tsconfig.json"]
|
|
||||||
comment-token = "//"
|
|
||||||
config = { enable = true, lint = true, unstable = true }
|
|
||||||
language-server = { command = "deno", args = ["lsp"], language-id = "javascriptreact" }
|
|
||||||
indent = { tab-width = 2, unit = " " }
|
|
||||||
grammar = "javascript"
|
|
||||||
auto-format = true
|
|
||||||
|
|
||||||
[[language]]
|
|
||||||
name = "tsx"
|
|
||||||
scope = "source.tsx"
|
|
||||||
injection-regex = "^(tsx)$" # |typescript
|
|
||||||
file-types = ["tsx"]
|
|
||||||
shebangs = ["deno", "node"]
|
|
||||||
roots = ["deno.jsonc", "deno.json", "package.json", "tsconfig.json"]
|
|
||||||
config = { enable = true, lint = true, unstable = true }
|
|
||||||
language-server = { command = "deno", args = ["lsp"], language-id = "typescriptreact" }
|
|
||||||
indent = { tab-width = 2, unit = " " }
|
|
||||||
auto-format = true
|
|
||||||
|
|
||||||
[[language]]
|
|
||||||
name = "jsonc"
|
|
||||||
scope = "source.jsonc"
|
|
||||||
injection-regex = "^(jsonc)$"
|
|
||||||
file-types = ["jsonc"]
|
|
||||||
shebangs = ["deno", "node"]
|
|
||||||
roots = ["deno.jsonc", "deno.json", "package.json", "tsconfig.json"]
|
|
||||||
config = { enable = true, lint = true, unstable = true }
|
|
||||||
language-server = { command = "deno", args = ["lsp"], language-id = "jsonc" }
|
|
||||||
indent = { tab-width = 2, unit = " " }
|
|
||||||
auto-format = true
|
|
||||||
*/
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -185,10 +145,10 @@
|
||||||
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"];
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPLXOjupz3ScYjgrF+ehrbp9OvGAWQLI6fplX6w9Ijb daniel@lyte.dev"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPLXOjupz3ScYjgrF+ehrbp9OvGAWQLI6fplX6w9Ijb daniel@lyte.dev"
|
||||||
];
|
];
|
||||||
group = "daniel";
|
group = "daniel";
|
||||||
extraGroups = ["users" "wheel" "video" "dialout"];
|
extraGroups = ["users" "wheel" "video" "dialout" "uucp"];
|
||||||
packages = [];
|
packages = [];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -240,4 +240,10 @@
|
||||||
users = {
|
users = {
|
||||||
defaultUserShell = pkgs.fish;
|
defaultUserShell = pkgs.fish;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
# https://betaflight.com/docs/wiki/archive/Installing-Betaflight#step-1
|
||||||
|
# ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="df11", MODE="0664", GROUP="uucp"
|
||||||
|
# ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE="0664", GROUP="uucp"'
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue