AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup flakes

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-05-24 21:20:43 +03:00
parent 94273b6c73
commit 7302cbf587
1 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
flake.nix
View File

@ -92,19 +92,13 @@
findModules (dir + "/${name}")) findModules (dir + "/${name}"))
(builtins.readDir dir))); (builtins.readDir dir)));
# pkgsFor = system:
# import inputs.nixpkgs {
# overlays = [ self.overlay ];
# localSystem = { inherit system; };
# config = {
# android_sdk.accept_license = true;
# };
# };
patchesPath = map (x: ./patches + "/${x}"); patchesPath = map (x: ./patches + "/${x}");
in flake-utils-plus.lib.mkFlake rec { in flake-utils-plus.lib.mkFlake rec {
inherit self inputs; inherit self inputs;
supportedSystems = [ "x86_64-linux" "aarch64-linux" ]; supportedSystems = [
"x86_64-linux"
# "aarch64-linux"
];
customModules = builtins.listToAttrs (findModules ./modules); customModules = builtins.listToAttrs (findModules ./modules);
nixosProfiles = builtins.listToAttrs (findModules ./profiles); nixosProfiles = builtins.listToAttrs (findModules ./profiles);
@ -116,7 +110,7 @@
"ivpn.patch" "ivpn.patch"
"mullvad-exclude-containers.patch" "mullvad-exclude-containers.patch"
"vaultwarden.patch" "vaultwarden.patch"
"waydroid-1.4.0.patch" "waydroid-1.4.1.patch"
"webhooks.patch" "webhooks.patch"
"ydotoold.patch" "ydotoold.patch"
]; ];
@ -132,12 +126,10 @@
hostnames = builtins.attrNames (builtins.readDir ./machines); hostnames = builtins.attrNames (builtins.readDir ./machines);
mkHost = name: let mkHost = name: let
system = builtins.readFile (./machines + "/${name}/system"); system = builtins.readFile (./machines + "/${name}/system");
# pkgs = pkgsFor system;
in { in {
inherit system; inherit system;
modules = __attrValues self.customModules ++ [ modules = __attrValues self.customModules ++ [
(import (./machines + "/${name}")) (import (./machines + "/${name}"))
# { nixpkgs.pkgs = pkgs; }
{ device = name; mainuser = "ataraxia"; } { device = name; mainuser = "ataraxia"; }
inputs.vscode-server.nixosModule inputs.vscode-server.nixosModule
]; ];
@ -164,27 +156,6 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
channelName = "unstable-zfs"; channelName = "unstable-zfs";
}; };
Flakes-ISO = {
system = "x86_64-linux";
modules = [
(import (./machines/Flakes-ISO))
{ device = "Flakes-ISO"; mainuser = "ataraxia"; }
./machines/Home-Hypervisor/autoinstall.nix
./machines/AMD-Workstation/autoinstall.nix
./machines/Dell-Laptop/autoinstall.nix
./machines/NixOS-VM/autoinstall.nix
self.customModules.autoinstall
];
specialArgs = { inherit inputs; };
};
Flakes-ISO-Aarch64 = {
system = "aarch64-linux";
modules = __attrValues self.customModules ++ [
(import (./machines/Flakes-ISO)) { device = "Flakes-ISO-Aarch64"; mainuser = "ataraxia"; }
./machines/Arch-Builder-VM/autoinstall.nix
];
specialArgs = { inherit inputs; };
};
}; };
outputsBuilder = channels: let outputsBuilder = channels: let
@ -224,32 +195,27 @@
]; ];
}; };
packages = { packages = {
Wayland-VM = nixos-generators.nixosGenerate {
system = builtins.readFile (./machines/Wayland-VM/system);
modules = __attrValues self.customModules ++ [
(import (./machines/Wayland-VM))
{ device = "Wayland-VM"; mainuser = "ataraxia"; }
];
specialArgs = { inherit inputs; };
format = "vm";
};
Flakes-ISO = nixos-generators.nixosGenerate { Flakes-ISO = nixos-generators.nixosGenerate {
system = "x86_64-linux"; system = "x86_64-linux";
modules = __attrValues self.customModules ++ [ modules = [
(import (./machines/Flakes-ISO)) (import (./machines/Flakes-ISO))
{ device = "Flakes-ISO"; mainuser = "ataraxia"; } { device = "Flakes-ISO"; mainuser = "ataraxia"; }
./machines/Home-Hypervisor/autoinstall.nix ./machines/Home-Hypervisor/autoinstall.nix
./machines/AMD-Workstation/autoinstall.nix
./machines/Dell-Laptop/autoinstall.nix
./machines/NixOS-VM/autoinstall.nix ./machines/NixOS-VM/autoinstall.nix
self.customModules.autoinstall
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
format = "install-iso"; format = "install-iso";
}; };
Flakes-ISO-Aarch64 = nixos-generators.nixosGenerate { Flakes-ISO-Aarch64 = nixos-generators.nixosGenerate {
system = "aarch64-linux"; system = "aarch64-linux";
modules = __attrValues self.customModules ++ [ modules = [
(import (./machines/Flakes-ISO)) (import (./machines/Flakes-ISO))
{ device = "Flakes-ISO-Aarch64"; mainuser = "ataraxia"; } { device = "Flakes-ISO"; mainuser = "ataraxia"; }
./machines/Arch-Builder-VM/autoinstall.nix ./machines/Arch-Builder-VM/autoinstall.nix
self.customModules.autoinstall
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
format = "install-iso"; format = "install-iso";