added nixfmt-tree as formatter

also ran it, which is why so many files were modified
This commit is contained in:
Gabriella Bere 2025-06-03 16:10:04 +01:00
parent e8487933ec
commit f482d6f06b
14 changed files with 125 additions and 108 deletions

160
flake.nix
View file

@ -52,64 +52,67 @@
musnix.url = "github:musnix/musnix";
};
outputs = {
self,
nixpkgs-stable,
nixpkgs,
nixpkgs-master,
nur,
home-manager,
...
} @ inputs: let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config = {allowUnfree = true;};
overlays = [
overlay-stable
overlay-master
nur.overlays.default
outputs =
{
self,
nixpkgs-stable,
nixpkgs,
nixpkgs-master,
nur,
home-manager,
...
}@inputs:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
};
overlays = [
overlay-stable
overlay-master
nur.overlays.default
];
};
genericModules = [
{
nix.registry.nixos.flake = inputs.self;
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
nix.nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
}
];
};
genericModules = [
{
nix.registry.nixos.flake = inputs.self;
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
nix.nixPath = ["nixpkgs=${nixpkgs.outPath}"];
}
];
genericHomeModule = [
{
nix.registry.nixos.flake = inputs.self;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}
];
# Overlay definitions
# nixpkgs-unstable
overlay-stable = final: prev: {
stable = import nixpkgs-stable {
genericHomeModule = [
{
nix.registry.nixos.flake = inputs.self;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}
];
# Overlay definitions
# nixpkgs-unstable
overlay-stable = final: prev: {
stable = import nixpkgs-stable {
inherit system;
config.allowUnfree = true;
};
};
# nixpkgs-master
overlay-master = final: prev: {
master = import nixpkgs-master {
inherit system;
config.allowUnfree = true;
};
};
in
{
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
inherit system;
config.allowUnfree = true;
};
};
# nixpkgs-master
overlay-master = final: prev: {
master = import nixpkgs-master {
inherit system;
config.allowUnfree = true;
};
};
in {
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
inherit system;
inherit pkgs;
specialArgs = {
inherit inputs;
};
modules =
genericModules
++ [
inherit pkgs;
specialArgs = {
inherit inputs;
};
modules = genericModules ++ [
# Import nixos modules here
./hosts/gabbielaptop/configuration.nix
./modules/nh.nix
@ -122,36 +125,35 @@
# inputs.stylix.nixosModules.stylix
# inputs.home-manager.nixosModules.home-manager
# inputs.nixvim.homeManagerModules.nixvim
{nix.settings = inputs.aagl.nixConfig;} # Setup cachix for aagl projects
{ nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
# { home-manager.users.blue = ./home-manager/home.nix; }
];
};
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
inherit system;
inherit pkgs;
modules =
genericModules
++ [
};
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
inherit system;
inherit pkgs;
modules = genericModules ++ [
inputs.disko.nixosModules.disko
inputs.satisfactory-server.nixosModules.satisfactory
./hosts/biggerpi/configuration.nix
./modules/satisfactory-server.nix
];
};
# Standalone home-manager config
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
};
# Import home-manager modules here
modules = [
./home-manager/home.nix
inputs.nvf.homeManagerModules.default
inputs.stylix.homeModules.stylix
inputs.nix-flatpak.homeManagerModules.nix-flatpak
];
# Standalone home-manager config
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
};
# Import home-manager modules here
modules = [
./home-manager/home.nix
inputs.nvf.homeManagerModules.default
inputs.stylix.homeModules.stylix
inputs.nix-flatpak.homeManagerModules.nix-flatpak
];
};
formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree;
};
};
}