refactor(treewide): format with alejandra

This commit is contained in:
ooks-io 2024-07-29 15:00:38 +12:00
parent 7fefb94400
commit 61cef505da
216 changed files with 5995 additions and 3969 deletions

View file

@ -1,6 +1,9 @@
{ inputs, self, withSystem, ... }:
let
{
inputs,
self,
withSystem,
...
}: let
inherit (inputs.nixpkgs.lib) nixosSystem;
inherit (self) keys;
@ -19,36 +22,34 @@ let
];
specialArgs = {inherit withSystem keys inputs self;};
in
{
in {
ooksdesk = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [ "${hosts}/ooksdesk" ] ++ workstation;
modules = ["${hosts}/ooksdesk"] ++ workstation;
};
ookst480s = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [ "${hosts}/ookst480s" ] ++ workstation;
modules = ["${hosts}/ookst480s"] ++ workstation;
};
ooksmedia = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [ "${hosts}/ooksmedia" nixarr ] ++ workstation;
modules = ["${hosts}/ooksmedia" nixarr] ++ workstation;
};
ooksmicro = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [ "${hosts}/ooksmicro" ] ++ workstation;
modules = ["${hosts}/ooksmicro"] ++ workstation;
};
ooksx1 = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [ "${hosts}/ooksx1" ] ++ workstation;
modules = ["${hosts}/ooksx1"] ++ workstation;
};
}

View file

@ -1,26 +1,29 @@
{ inputs, ... }:
{
{inputs, ...}: {
# For every flake input, aliases 'pkgs.inputs.${flake}' to
# 'inputs.${flake}.packages.${pkgs.system}' or
# 'inputs.${flake}.legacyPackages.${pkgs.system}'
flake-inputs = final: _: {
inputs = builtins.mapAttrs
(_: flake: let
legacyPackages = ((flake.legacyPackages or {}).${final.system} or {});
packages = ((flake.packages or {}).${final.system} or {});
in
if legacyPackages != {} then legacyPackages else packages
inputs =
builtins.mapAttrs
(
_: flake: let
legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
packages = (flake.packages or {}).${final.system} or {};
in
if legacyPackages != {}
then legacyPackages
else packages
)
inputs;
};
zjstatus = _final: prev: {
zjstatus = inputs.zjstatus.packages.${prev.system}.default;
};
};
# waybar = final: prev: {
# waybar = inputs.nixpkgs-wayland.packages.${prev.system}.waybar;
# };
additions = final: _prev: import ../pkgs { pkgs = final; };
additions = final: _prev: import ../pkgs {pkgs = final;};
}

View file

@ -1,6 +1,6 @@
{
perSystem = { pkgs, ... }: {
packages = {
{
perSystem = {pkgs, ...}: {
packages = {
live-buds-cli = pkgs.callPackage ./live-buds-cli {};
};
};

View file

@ -1,5 +1,12 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, dbus, libpulseaudio, bluez }:
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
dbus,
libpulseaudio,
bluez,
}:
rustPlatform.buildRustPackage rec {
pname = "live-buds-cli";
version = "0.1.9";
@ -9,13 +16,12 @@ rustPlatform.buildRustPackage rec {
repo = "LiveBudsCli";
rev = "v${version}";
sha256 = "A4XQiJrk4ehb6+935L2JFOeAhUJ7bdukV5mL0Jxn0sQ=";
};
cargoSha256 = "w/dt7Q9TACw5N/+QNAKMUEngf8sAhWyGslnw3B16crQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpulseaudio bluez dbus ];
nativeBuildInputs = [pkg-config];
buildInputs = [libpulseaudio bluez dbus];
meta = with lib; {
description = "A free cli tool to control your Galaxy buds live, Galaxy Buds+, Galaxy Buds Pro, Galaxy Buds 2 and Galaxy Buds 2 Pro";

View file

@ -1,9 +1,7 @@
let
sshKeys = import ../secrets/keys.nix;
in
{
perSystem = { ... }: {
in {
perSystem = {...}: {
imports = [
{
_module.args.keys = sshKeys;