small fixes, nixpkgs-fmt

This commit is contained in:
Grigory Shipunov 2022-09-28 21:42:37 +02:00
parent e8ed378623
commit 090acb6881
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
7 changed files with 55 additions and 20 deletions

View file

@ -1,15 +1,21 @@
{
inputs = {
nixpkgs-unstable.url = github:NixOS/nixpkgs/nixos-unstable;
nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05;
flake-utils.url = github:numtide/flake-utils;
sops-nix = {
url = github:Mic92/sops-nix;
inputs.nixpkgs.follows = "nixpkgs";
};
microvm = {
url = github:astro/microvm.nix;
inputs.nixpkgs.follows = "nixpkgs";
};
fenix = {
url = github:nix-community/fenix;
inputs.nixpkgs.follows = "nixpkgs-unstable";
@ -20,15 +26,31 @@
inputs@{ self
, nixpkgs
, nixpkgs-unstable
, flake-utils
, sops-nix
, microvm
, fenix
, ...
}:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
packages.slick = pkgs.callPackage "${self}/pkgs/slick.nix" { };
})
//
{
overlays.default = final: prev: {
inherit (self.packages.${prev.system})
slick;
};
nixosConfigurations = {
microwave = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
sops-nix.nixosModules.sops
./hosts/microwave
@ -43,7 +65,10 @@
./modules/tlp.nix
./modules/virtualization.nix
({ pkgs, ... }: {
nixpkgs.overlays = [ fenix.overlay ];
nixpkgs.overlays = [
fenix.overlay
self.overlays.default
];
environment.systemPackages = with pkgs; [
(fenix.packages."x86_64-linux".stable.withComponents [
"cargo"