peprolinbot/frues-clan
1
0
Fork 0
Code Issues Pull requests 1 Wiki Activity Actions

Compare commits

base: peprolinbot:715f3d6f936b47c927fc3bc00b03b22981d0882b
Branches Tags
peprolinbot:main
peprolinbot:flake-update
..
compare: peprolinbot:2d065e249323d0905a124157118a9c290e4f1e96
Branches Tags
peprolinbot:main
peprolinbot:flake-update

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

3 changed files with 40 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

15
flake.nix
View file

@ -28,22 +28,19 @@
}; };
}; };
outputs = outputs = {
{
self, self,
clan-core, clan-core,
nixpkgs, nixpkgs,
... ...
}@inputs: } @ inputs: let
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.
@ -57,7 +54,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];
}; };
}); });

3
modules/base.nix
View file

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

34
users/pedro/home-configuration/helix.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
programs.helix = { programs.helix = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
@ -7,49 +6,32 @@
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 = { nil = {command = "${pkgs.nil}/bin/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 = [ args = ["--quiet" "-"];
"--quiet"
"-"
];
};
}
{
name = "json";
formatter = {
command = "${pkgs.nodePackages.prettier}/bin/prettier";
args = [
"--parser"
"json"
];
}; };
} }
]; ];
}; };
settings = { }; settings = {};
}; };
} }