refactor: inputs/ --> {sys,home}/

This commit is contained in:
ooks-io 2024-05-26 14:57:35 +12:00
parent 8f22a24963
commit f77c627980
225 changed files with 77 additions and 88 deletions

View file

@ -11,11 +11,11 @@
]; ];
imports = [ imports = [
./outputs/pkgs ./flake/pkgs
]; ];
flake = { flake = {
nixosConfigurations = import ./outputs/nixos.nix {inherit self inputs nixpkgs;}; nixosConfigurations = import ./flake/nixos.nix {inherit self inputs nixpkgs;};
}; };
}); });

View file

@ -5,7 +5,7 @@ let
hm = inputs.home-manager.nixosModules.home-manager; hm = inputs.home-manager.nixosModules.home-manager;
systemInputs = "${self}/inputs/system"; systemInputs = "${self}/sys";
hosts = "${systemInputs}/hosts"; hosts = "${systemInputs}/hosts";
base = "${systemInputs}/modules/base"; base = "${systemInputs}/modules/base";
@ -31,6 +31,17 @@ in
workstation workstation
]; ];
}; };
ookst480s = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
"${hosts}/ookst480s"
hm
base
workstation
];
};
ooksmedia = nixosSystem { ooksmedia = nixosSystem {
inherit specialArgs; inherit specialArgs;
system = "x86_64-linux"; system = "x86_64-linux";

View file

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, pkg-config, dbus, libpulseaudio, bluez }: { lib, rustPlatform, fetchFromGitHub, pkg-config, dbus, libpulseaudio, bluez }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "live-buds-cli"; pname = "live-buds-cli";
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
}; };
cargoSha256 = "w/dt7Q9TACw5N/+QNAKMUEngf8sAhWyGslnw3B16crQ="; # you will need to determine this hash cargoSha256 = "w/dt7Q9TACw5N/+QNAKMUEngf8sAhWyGslnw3B16crQ=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpulseaudio bluez dbus ]; buildInputs = [ libpulseaudio bluez dbus ];
@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { 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"; description = "A free cli tool to control your Galaxy buds live, Galaxy Buds+, Galaxy Buds Pro, Galaxy Buds 2 and Galaxy Buds 2 Pro";
license = licenses.gpl3; license = licenses.gpl3;
#maintainers = [ maintainers.ooks-io ]; # replace with your maintainer info
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -5,7 +5,6 @@
./git ./git
./tools ./tools
./ssh ./ssh
./transientServices
]; ];
options.homeModules.console.utility = { options.homeModules.console.utility = {
@ -21,8 +20,5 @@
tools = { tools = {
enable = lib.mkEnableOption "Enable various console tools"; enable = lib.mkEnableOption "Enable various console tools";
}; };
transientServices = {
enable = lib.mkEnableOption "Enable various console transientServices";
};
}; };
} }

Some files were not shown because too many files have changed in this diff Show more