Compare commits

...

2 commits

Author SHA1 Message Date
715f3d6f93
Add JSON config for Helix
Some checks are pending
Flake check / check (push) Waiting to run
Update `flake.lock` / update_lockfile (push) Waiting to run
2025-10-30 19:11:35 +01:00
902b296299
Commit some reformatted files 2025-10-30 19:10:44 +01:00
3 changed files with 62 additions and 40 deletions

View file

@ -28,36 +28,39 @@
}; };
}; };
outputs = { outputs =
self, {
clan-core, self,
nixpkgs, clan-core,
... nixpkgs,
} @ inputs: let ...
# Usage see: https://docs.clan.lol }@inputs:
clan = clan-core.lib.clan { let
inherit self; # Usage see: https://docs.clan.lol
imports = [./clan.nix]; clan = clan-core.lib.clan {
specialArgs = {inherit inputs;}; inherit self;
}; imports = [ ./clan.nix ];
in { specialArgs = { inherit inputs; };
inherit (clan.config) nixosConfigurations nixosModules clanInternals; };
# Add the Clan cli tool to the dev shell. in
# Use "nix develop" to enter the dev shell. {
devShells = inherit (clan.config) nixosConfigurations nixosModules clanInternals;
nixpkgs.lib.genAttrs # Add the Clan cli tool to the dev shell.
[ # Use "nix develop" to enter the dev shell.
"x86_64-linux" devShells =
"aarch64-linux" nixpkgs.lib.genAttrs
"aarch64-darwin" [
"x86_64-darwin" "x86_64-linux"
] "aarch64-linux"
(system: { "aarch64-darwin"
default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell { "x86_64-darwin"
packages = [clan-core.packages.${system}.clan-cli]; ]
}; (system: {
}); default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell {
packages = [ clan-core.packages.${system}.clan-cli ];
};
});
clan = clan.config; clan = clan.config;
}; };
} }

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
# Must-have packages # Must-have packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.helix = { programs.helix = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
@ -6,32 +7,49 @@
language-server = { language-server = {
pyright = { pyright = {
command = "${pkgs.pyright}/bin/pyright-langserver"; command = "${pkgs.pyright}/bin/pyright-langserver";
args = ["--stdio"]; args = [ "--stdio" ];
config = {}; config = { };
}; };
nil = {command = "${pkgs.nil}/bin/nil";}; nil = {
command = "${pkgs.nil}/bin/nil";
};
vscode-json-language-server.command = "${pkgs.nodePackages.vscode-json-languageserver}/bin/vscode-json-languageserver";
}; };
language = [ language = [
{ {
name = "nix"; name = "nix";
language-servers = ["nil"]; language-servers = [ "nil" ];
auto-format = true; auto-format = true;
formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
} }
{ {
name = "python"; name = "python";
language-servers = ["pyright"]; language-servers = [ "pyright" ];
auto-format = true; auto-format = true;
formatter = { formatter = {
command = "${pkgs.black}/bin/black"; command = "${pkgs.black}/bin/black";
args = ["--quiet" "-"]; args = [
"--quiet"
"-"
];
};
}
{
name = "json";
formatter = {
command = "${pkgs.nodePackages.prettier}/bin/prettier";
args = [
"--parser"
"json"
];
}; };
} }
]; ];
}; };
settings = {}; settings = { };
}; };
} }