fix: got the rust formatting optional
This commit is contained in:
parent
85263798eb
commit
461cc3a899
7 changed files with 34 additions and 65 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,6 +1,7 @@
|
|||
.direnv/
|
||||
|
||||
# nixago: ignore-linked-files
|
||||
/rustfmt.toml
|
||||
/treefmt.toml
|
||||
/.prettierrc.json
|
||||
/lefthook.yml
|
||||
|
|
15
flake.lock
15
flake.lock
|
@ -1,19 +1,5 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-schemas": {
|
||||
"locked": {
|
||||
"lastModified": 1697467827,
|
||||
"narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=",
|
||||
"rev": "764932025c817d4e500a8d2a4d8c565563923d29",
|
||||
"revCount": 29,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.2.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
|
@ -379,7 +365,6 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-schemas": "flake-schemas",
|
||||
"nixago": "nixago",
|
||||
"nixago-exts": "nixago-exts_3",
|
||||
"nixpkgs": "nixpkgs"
|
||||
|
|
44
flake.nix
44
flake.nix
|
@ -9,8 +9,6 @@
|
|||
|
||||
nixago-exts.url = "github:nix-community/nixago-extensions";
|
||||
nixago-exts.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
flake-schemas.url = "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.2.tar.gz";
|
||||
};
|
||||
|
||||
outputs = inputs @ { self, nixpkgs, nixago, nixago-exts, ... }:
|
||||
|
@ -22,37 +20,41 @@
|
|||
pkgs = import nixpkgs { inherit system; };
|
||||
});
|
||||
in
|
||||
rec
|
||||
{
|
||||
# The schemes we use.
|
||||
schemas = inputs.flake-schemas.schemas;
|
||||
|
||||
# Expose the configuration options for setup.
|
||||
nixosModules = {
|
||||
mfgames-project-setup = import ./src/modules/default.nix;
|
||||
default = self.nixosModules.mfgames-project-setup;
|
||||
};
|
||||
|
||||
# Expose the configuration information.
|
||||
lib = {
|
||||
sayHello = nixpkgs."x86_64-linux".lib.debug.traceVal (name: "Hello there, ${name}!");
|
||||
mkShellHook =
|
||||
{ system
|
||||
, pkgs
|
||||
, rust ? { }
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
rustDefaults = { enable = false; };
|
||||
configs = import ./src/configs/default.nix {
|
||||
inherit system pkgs nixago nixago-exts;
|
||||
rust = rustDefaults // rust;
|
||||
};
|
||||
in
|
||||
''
|
||||
${configs.shellHook}
|
||||
${pkgs.lefthook}/bin/lefthook install
|
||||
'';
|
||||
};
|
||||
|
||||
configs =
|
||||
forEachSupportedSystem ({ system, pkgs }:
|
||||
(import ./src/configs/default.nix { inherit system pkgs nixago nixago-exts; }));
|
||||
|
||||
# Set up the developer shell.
|
||||
devShells = forEachSupportedSystem ({ system, pkgs }:
|
||||
let
|
||||
configs = import ./src/configs/default.nix { inherit system pkgs nixago nixago-exts; };
|
||||
configShellHook = lib.mkShellHook {
|
||||
inherit system pkgs;
|
||||
#rust.enable = false;
|
||||
};
|
||||
in
|
||||
{
|
||||
# Shell
|
||||
default = pkgs.mkShell {
|
||||
shellHook = ''
|
||||
${configs.shellHook}
|
||||
lefthook install
|
||||
'';
|
||||
shellHook = configShellHook;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
inputs:
|
||||
inputs.nixago.lib.${inputs.system}.makeAll [
|
||||
inputs @ { pkgs, rust ? { enable = false; }, ... }:
|
||||
let lib = pkgs.lib; in
|
||||
inputs.nixago.lib.${inputs.system}.makeAll ([
|
||||
(import ./conform.nix (inputs))
|
||||
(import ./editorconfig.nix (inputs))
|
||||
(import ./lefthook.nix (inputs))
|
||||
(import ./prettier.nix (inputs))
|
||||
#(import ./rustfmt.nix (inputs))
|
||||
(import ./treefmt.nix (inputs))
|
||||
]
|
||||
++ lib.optionals rust.enable [
|
||||
(import ./rustfmt.nix (inputs))
|
||||
])
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
inputs:
|
||||
inputs @ { pkgs, ... }:
|
||||
let
|
||||
data = {
|
||||
brace_style = "AlwaysNextLine";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
inputs @ { pkgs, ... }:
|
||||
inputs @ { pkgs, rust, ... }:
|
||||
let
|
||||
data = {
|
||||
formatter = {
|
||||
|
@ -24,7 +24,8 @@ let
|
|||
];
|
||||
excludes = [ "**.min.js" ];
|
||||
};
|
||||
|
||||
}
|
||||
// pkgs.lib.attrsets.optionalAttrs rust.enable {
|
||||
rust = {
|
||||
command = "rustfmt";
|
||||
options = [ "--edition" "2021" ];
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.mfgames-project-setup;
|
||||
secretType = types.submodule ({ config, ... }: {
|
||||
options = {
|
||||
rust = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
};
|
||||
});
|
||||
in
|
||||
{
|
||||
options.mfgames-project-setup = {
|
||||
rust = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Enabling this option including tools for handling Rust projects.
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue