lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Daniel Flanagan 2023-10-30 11:31:04 -05:00
commit 840e93de8a
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
2 changed files with 40 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
modules/home-manager/helix.nix
View file

@ -9,10 +9,10 @@
package = inputs.helix.packages.${system}.helix;
languages = {
language-server = {
# lexical = {
# command = "lexical";
# args = ["start"];
# };
lexical = {
command = "lexical";
args = ["start"];
};
# next-ls = {
# command = "next-ls";
@ -31,31 +31,31 @@
};
language = [
# {
# name = "elixir";
# language-servers = ["elixir-ls"]; # "lexical" "next-ls"
# auto-format = true;
# }
# {
# name = "html";
# auto-format = false;
# }
# {
# name = "nix";
# auto-format = true;
# formatter = {
# command = "alejandra";
# args = ["-"];
# };
# }
# {
# name = "fish";
# auto-format = true;
# indent = {
# tab-width = 2;
# unit = "\t";
# };
# }
{
name = "elixir";
language-servers = ["lexical"]; # "lexical" "next-ls" ?
auto-format = true;
}
{
name = "html";
auto-format = false;
}
{
name = "nix";
auto-format = true;
formatter = {
command = "alejandra";
args = ["-"];
};
}
{
name = "fish";
auto-format = true;
indent = {
tab-width = 2;
unit = "\t";
};
}
# {
# name = "javascript";
@ -116,46 +116,6 @@
# };
# 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 = "▏";
};
# lsp = {
# display-messages = true;
lsp = {
display-messages = true;
# display-inlay-hints = true;
# };
};
# statusline = {
# left = ["mode" "spinner" "selections" "primary-selection-length" "position" "position-percentage" "diagnostics" "workspace-diagnostics"];
# center = ["file-name"];

8
modules/nixos/common.nix
View file

@ -88,7 +88,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPLXOjupz3ScYjgrF+ehrbp9OvGAWQLI6fplX6w9Ijb daniel@lyte.dev"
];
group = "daniel";
extraGroups = ["users" "wheel" "video" "dialout"];
extraGroups = ["users" "wheel" "video" "dialout" "uucp"];
packages = [];
};
@ -240,4 +240,10 @@
users = {
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"'
'';
}