cry/flake
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: cry:f1224c8cf80edc2d1e63cdd8e81b00329ab94cf4
Branches Tags
cry:main
cry:pc/latest
cry:laptop
cry:lolcathost-24.05
cry:myputer
cry:lolcathost
..
compare: cry:47bc060da7def6aa54faa5e7cb37fda5306c5139
Branches Tags
cry:main
cry:pc/latest
cry:laptop
cry:lolcathost-24.05
cry:myputer
cry:lolcathost

No commits in common. "f1224c8cf80edc2d1e63cdd8e81b00329ab94cf4" and "47bc060da7def6aa54faa5e7cb37fda5306c5139" have entirely different histories.
f1224c8cf8 ... 47bc060da7

2 changed files with 40 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769819491, "lastModified": 1769819040,
"narHash": "sha256-hMr47pVjBGd9Jk0zlKL66GWBlS6E50Mp4sW0OBvneSk=", "narHash": "sha256-sFtlxsSXGH3BFkM7REuwntmKQ9f1SeDQIqEK8jTdz34=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c0f53e00c1888ff9bd92055f0bdc3fe9f218d387", "rev": "e001182489cea3e4cb2a461eb83a7c163f38b7e7",
"revCount": 57, "revCount": 56,
"type": "git", "type": "git",
"url": "https://forge.imbored.dev/emileclarkb/dobutterfliescry.net" "url": "https://forge.imbored.dev/emileclarkb/dobutterfliescry.net"
}, },

42
homes/modules/editor/helix.nix
View file

@ -4,17 +4,20 @@
... ...
}: let }: let
lsps = { lsps = {
bash-language-server = { bash-language-server =
{
pkg = pkgs.bash-language-server; pkg = pkgs.bash-language-server;
cmd = "bash-language-server"; cmd = "bash-language-server";
}; };
clangd = { clangd =
{
pkg = pkgs.clang-tools; pkg = pkgs.clang-tools;
cmd = "clangd"; cmd = "clangd";
}; };
haskell-language-server = { haskell-language-server =
{
pkg = pkgs.haskell-language-server; pkg = pkgs.haskell-language-server;
cmd = "haskell-language-server-wrapper"; cmd = "haskell-language-server-wrapper";
}; };
@ -22,30 +25,29 @@
# TODO: once upgraded past Nix-24.07 this line won't be necessary (I think) # TODO: once upgraded past Nix-24.07 this line won't be necessary (I think)
# helix will support nixd by default # helix will support nixd by default
# SOURCE: https://github.com/nix-community/nixd/blob/main/nixd/docs/editor-setup.md#Helix # SOURCE: https://github.com/nix-community/nixd/blob/main/nixd/docs/editor-setup.md#Helix
nixd = { nixd =
{
pkg = pkgs.nixd; pkg = pkgs.nixd;
cmd = "nixd"; cmd = "nixd";
}; };
OmniSharp = { OmniSharp =
{
pkg = pkgs.omnisharp-roslyn; pkg = pkgs.omnisharp-roslyn;
cmd = "OmniSharp"; cmd = "OmniSharp";
}; };
rust-analyzer = { rust-analyzer =
{
pkg = pkgs.rust-analyzer; pkg = pkgs.rust-analyzer;
cmd = "rust-analyzer"; cmd = "rust-analyzer";
}; };
ty = { ty =
{
pkg = pkgs-unstable.ty; pkg = pkgs-unstable.ty;
cmd = "ty"; cmd = "ty";
}; };
typescript-language-server = {
pkg = pkgs.typescript-language-server;
cmd = "typescript-language-server";
};
}; };
in { in {
home.packages = home.packages =
@ -222,25 +224,11 @@ in {
# formatter.command = "${pkgs.omnisharp-roslyn}/bin/OmniSharp"; # formatter.command = "${pkgs.omnisharp-roslyn}/bin/OmniSharp";
# language-servers = ["OmniSharp"]; # language-servers = ["OmniSharp"];
} }
{
name = "javascript";
file-types = ["js"];
indent = {
tab-width = 2;
unit = " ";
};
block-comment-tokens = {
start = "/*";
end = "*/";
};
auto-format = true;
language-servers = ["typescript-language-server"];
}
]; ];
language-server = language-server =
lsps lsps
|> builtins.mapAttrs (_: lsp: {command = "${lsp.pkg}/bin/${lsp.cmd}";}); |> builtins.mapAttrs (_: lsp: { command = "${lsp.pkg}/bin/${lsp.cmd}"; });
}; };
}; };
} }