bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to nixpkgs-fmt formatter

Browse source
This commit is contained in:
Filippo Berto 2023-02-24 09:24:21 +01:00
parent 36f6903639
commit ca59cb8f3c
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
45 changed files with 695 additions and 606 deletions
Download patch file Download diff file Expand all files Collapse all files

84
flake.nix
View file

@ -43,9 +43,20 @@
};
};
outputs = { self, nixpkgs, nixpkgs-u, home-manager, agenix, deploy-rs
, flake-utils, nixos-generators, nixos-hardware, nix-rice, pre-commit-hooks
, tex2nix }:
outputs =
{ self
, nixpkgs
, nixpkgs-u
, home-manager
, agenix
, deploy-rs
, flake-utils
, nixos-generators
, nixos-hardware
, nix-rice
, pre-commit-hooks
, tex2nix
}:
let
config = {
allowUnfree = true;
@ -98,16 +109,14 @@
eachDefaultSystem (system:
let pkgs = import nixpkgs { inherit system config overlays; };
in {
formatter = pkgs.writeShellScriptBin "formatter" ''
${pkgs.findutils}/bin/find . -name '*.nix' -exec ${pkgs.nixfmt}/bin/nixfmt {} \+
'';
formatter = pkgs.nixpkgs-fmt;
checks = {
pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.;
hooks = {
deadnix.enable = true;
nixfmt.enable = true;
nixpkgs-fmt.enable = true;
statix.enable = true;
};
};
@ -235,37 +244,39 @@
};
odinConfig = {
nixosConfigurations = let
odinCommonModules = [
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd
./odin/hardware-configuration.nix
./odin/common_configuration.nix
nixosConfigurations =
let
odinCommonModules = [
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd
./odin/hardware-configuration.nix
./odin/common_configuration.nix
./nixos_modules/pro_audio.nix
./nixos_modules/sesar.nix
./nixos_modules/pentablet.nix
./nixos_modules/steam-link.nix
./nixos_modules/kdeconnect.nix
./nixos_modules/pro_audio.nix
./nixos_modules/sesar.nix
./nixos_modules/pentablet.nix
./nixos_modules/steam-link.nix
./nixos_modules/kdeconnect.nix
{ home-manager.users.bertof = import ./odin/hm.nix; }
];
in rec {
odin-nvidia = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ odinCommonModules
++ [ ./odin/configuration-nvidia.nix ];
{ home-manager.users.bertof = import ./odin/hm.nix; }
];
in
rec {
odin-nvidia = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ odinCommonModules
++ [ ./odin/configuration-nvidia.nix ];
};
odin-intel = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ odinCommonModules
++ [ ./odin/configuration-intel.nix ];
};
odin = odin-intel;
};
odin-intel = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ odinCommonModules
++ [ ./odin/configuration-intel.nix ];
};
odin = odin-intel;
};
};
# freyaConfig = {
@ -380,7 +391,8 @@
};
});
in builtins.foldl' nixpkgs.lib.recursiveUpdate { } [
in
builtins.foldl' nixpkgs.lib.recursiveUpdate { } [
basic
thorConfig
odinConfig