Compare commits

..

No commits in common. "715f3d6f936b47c927fc3bc00b03b22981d0882b" and "2d065e249323d0905a124157118a9c290e4f1e96" have entirely different histories.

3 changed files with 40 additions and 62 deletions

View file

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

View file

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

View file

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