Lots of refactoring
This commit is contained in:
Lauren Lagarde
parent
2f65f8fcba
commit
70e37a959e
46 changed files with 635 additions and 400 deletions
151
flake.nix
151
flake.nix
|
|
@ -30,18 +30,23 @@
|
|||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
nixos-generators.url = "github:nix-community/nixos-generators/7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565";
|
||||
nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# Lix over Nix
|
||||
lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
|
||||
lix-module.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# Installers
|
||||
disko.url = "github:nix-community/disko/v1.11.0";
|
||||
nixos-generators.url = "github:nix-community/nixos-generators/7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565";
|
||||
nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# Home Manager
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
ll-home-manager.url = "./users/lauren_lagarde/home-manager/";
|
||||
|
||||
# Extras
|
||||
waveforms.url = "github:liff/waveforms-flake";
|
||||
disko.url = "github:nix-community/disko/v1.11.0";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nixos-generators, disko, waveforms, lix-module, ... }@inputs: let
|
||||
|
|
@ -50,7 +55,8 @@
|
|||
locale = "en_US.UTF-8";
|
||||
stateVersion = "24.11";
|
||||
|
||||
unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
pkgs-unstable = import nixpkgs-unstable { inherit system; };
|
||||
|
||||
iso_modules = [
|
||||
"${nixpkgs}/nixos/modules/installer/cd-dvd/iso-image.nix"
|
||||
|
|
@ -76,6 +82,7 @@
|
|||
time.timeZone = timezone;
|
||||
system.stateVersion = stateVersion;
|
||||
}
|
||||
|
||||
lix-module.nixosModules.default
|
||||
home-manager.nixosModules.home-manager
|
||||
waveforms.nixosModule
|
||||
|
|
@ -83,34 +90,17 @@
|
|||
];
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
ll-nixos-headless = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "ll-nixos-headless"; }
|
||||
./systems/ll-nixos-headless.nix
|
||||
] ++ inherited_modules;
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
|
||||
ll-nixos = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "ll-nixos"; }
|
||||
./systems/ll-nixos-full.nix
|
||||
] ++ inherited_modules;
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
|
||||
ll-latitude-e5591 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
modules = [
|
||||
{
|
||||
networking.hostName = "ll-latitude-e5591";
|
||||
networking.hostId = "f55542ee";
|
||||
}
|
||||
./systems/ll-latitude-e5591.nix
|
||||
./disko/nvme/uefi-luks-lvm-ext4.nix
|
||||
] ++ inherited_modules;
|
||||
specialArgs = { unstable = unstable; };
|
||||
specialArgs = { inherit inputs pkgs-unstable; };
|
||||
};
|
||||
|
||||
ll-nixos-headless-pi = nixpkgs.lib.nixosSystem {
|
||||
|
|
@ -136,7 +126,22 @@
|
|||
}
|
||||
./systems/ll-nixos-headless.nix
|
||||
] ++ inherited_modules;
|
||||
specialArgs = { unstable = unstable; };
|
||||
specialArgs = { inherit inputs pkgs-unstable; };
|
||||
};
|
||||
|
||||
ll-nixos-base = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{
|
||||
networking.hostName = "ll-nixos-base";
|
||||
home-manager.users."lauren_lagarde" = { config, ... }: {
|
||||
imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
|
||||
};
|
||||
}
|
||||
./systems/ll-nixos-base.nix
|
||||
] ++ inherited_modules;
|
||||
|
||||
specialArgs = { inherit inputs pkgs-unstable; };
|
||||
};
|
||||
|
||||
# Real Systems
|
||||
|
|
@ -159,6 +164,17 @@
|
|||
./systems/vm-docker-base.nix
|
||||
] ++ inherited_modules;
|
||||
};
|
||||
|
||||
vm-docker-luks-test = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
{
|
||||
networking.hostName = "vm-docker-luks-test";
|
||||
networking.hostId = "1b5432b7";
|
||||
}
|
||||
./systems/vm-docker-luks.nix
|
||||
] ++ inherited_modules;
|
||||
};
|
||||
};
|
||||
|
||||
packages.aarch64-linux = {
|
||||
|
|
@ -169,7 +185,7 @@
|
|||
{ networking.hostName = "ll-nixos-headless-pi"; }
|
||||
./systems/ll-nixos-headless.nix
|
||||
] ++ inherited_modules;
|
||||
specialArgs = { unstable = unstable; };
|
||||
specialArgs = { inherit inputs pkgs-unstable; };
|
||||
};
|
||||
|
||||
token-pi-sdcard = nixos-generators.nixosGenerate {
|
||||
|
|
@ -179,7 +195,7 @@
|
|||
{ networking.hostName = "token-pi"; }
|
||||
./systems/ll-nixos-headless.nix
|
||||
] ++ inherited_modules;
|
||||
specialArgs = { unstable = unstable; };
|
||||
specialArgs = { inherit inputs pkgs-unstable; };
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -190,54 +206,49 @@
|
|||
##########################################################################
|
||||
# Personal Live Disks
|
||||
|
||||
ll-nixos-headless-iso = nixos-generators.nixosGenerate {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "ll-nixos-headless"; }
|
||||
./systems/ll-nixos-headless.nix
|
||||
] ++ inherited_modules;
|
||||
format = "install-iso";
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
# TODO: ll-nixos-headless-iso = nixos-generators.nixosGenerate {};
|
||||
|
||||
ll-nixos-base-iso = nixos-generators.nixosGenerate {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "ll-nixos-base"; }
|
||||
{
|
||||
networking.hostName = "ll-nixos";
|
||||
home-manager.users."lauren_lagarde" = { config, ... }: {
|
||||
imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
|
||||
};
|
||||
}
|
||||
./systems/ll-nixos-base.nix
|
||||
] ++ inherited_modules;
|
||||
specialArgs = {
|
||||
inherit inputs pkgs-unstable;
|
||||
};
|
||||
format = "install-iso";
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
|
||||
ll-nixos-full-iso = nixos-generators.nixosGenerate {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "ll-nixos"; }
|
||||
{
|
||||
networking.hostName = "ll-nixos";
|
||||
home-manager.users."lauren_lagarde" = { config, ... }: {
|
||||
imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
|
||||
};
|
||||
}
|
||||
./systems/ll-nixos-full.nix
|
||||
] ++ inherited_modules;
|
||||
specialArgs = {
|
||||
inherit inputs pkgs-unstable;
|
||||
};
|
||||
format = "install-iso";
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
|
||||
ll-latitude-e5591-iso = nixos-generators.nixosGenerate {
|
||||
ll-nixos-xmrig-worker-iso = nixos-generators.nixosGenerate {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "ll-latitude-e5591"; }
|
||||
./systems/ll-latitude-e5591.nix
|
||||
{ networking.hostName = "ll-nixos-xmrig-worker"; }
|
||||
./systems/ll-nixos-xmrig-worker.nix
|
||||
] ++ inherited_modules;
|
||||
format = "install-iso";
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
|
||||
ll-xmrig-worker-iso = nixos-generators.nixosGenerate {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "ll-xmrig-worker"; }
|
||||
./systems/ll-xmrig-worker.nix
|
||||
] ++ inherited_modules;
|
||||
format = "install-iso";
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
|
||||
##########################################################################
|
||||
|
|
@ -245,34 +256,14 @@
|
|||
##########################################################################
|
||||
# Systems
|
||||
|
||||
ll-nixos-factorio-iso = nixos-generators.nixosGenerate {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "ll-nixos-factorio"; }
|
||||
./systems/ll-nixos-factorio.nix
|
||||
] ++ inherited_modules;
|
||||
format = "install-iso";
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
|
||||
vm-docker-dhcp-iso = nixos-generators.nixosGenerate {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = ""; }
|
||||
./systems/vm-docker-dhcp.nix
|
||||
] ++ inherited_modules;
|
||||
format = "install-iso";
|
||||
specialArgs = { unstable = unstable; };
|
||||
};
|
||||
|
||||
living-room-nixos-iso = nixos-generators.nixosGenerate {
|
||||
system = "x86_64-linux";
|
||||
modules = iso_modules ++ [
|
||||
{ networking.hostName = "living-room-nixos-iso"; }
|
||||
./systems/ll-nixos-full.nix
|
||||
./systems/living-room-nixos.nix
|
||||
] ++ inherited_modules;
|
||||
format = "install-iso";
|
||||
specialArgs = { unstable = unstable; };
|
||||
specialArgs = { inherit inputs pkgs-unstable; };
|
||||
};
|
||||
|
||||
default = self.packages.x86_64-linux.ll-nixos-full-iso;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue