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,19 +28,22 @@
}; };
}; };
outputs = { outputs =
{
self, self,
clan-core, clan-core,
nixpkgs, nixpkgs,
... ...
} @ inputs: let }@inputs:
let
# Usage see: https://docs.clan.lol # Usage see: https://docs.clan.lol
clan = clan-core.lib.clan { clan = clan-core.lib.clan {
inherit self; inherit self;
imports = [./clan.nix]; imports = [ ./clan.nix ];
specialArgs = {inherit inputs;}; specialArgs = { inherit inputs; };
}; };
in { in
{
inherit (clan.config) nixosConfigurations nixosModules clanInternals; inherit (clan.config) nixosConfigurations nixosModules clanInternals;
# Add the Clan cli tool to the dev shell. # Add the Clan cli tool to the dev shell.
# Use "nix develop" to enter the dev shell. # Use "nix develop" to enter the dev shell.
@ -54,7 +57,7 @@
] ]
(system: { (system: {
default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell { default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell {
packages = [clan-core.packages.${system}.clan-cli]; packages = [ clan-core.packages.${system}.clan-cli ];
}; };
}); });

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 = { };
}; };
} }