banananetwork
/
server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

flake: extract nixosModules as submodule

Browse Source
main
Felix Stupp 1 year ago
parent 36f05dc63a
commit 9bc3059e6b
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7
2 changed files with 92 additions and 91 deletions
Show Stats Download Patch File Download Diff File

92
flake.nix
Unescape Escape View File

@ -100,97 +100,7 @@
result;
};
nixosConfigurations =
let
nixpkgs = inputs.nixpkgs;
nixosSystem =
{ modules, system }:
let
modsExtended = [
outputs.nixosModules.myOptions
outputs.nixosModules.withDepends
{ home-manager.sharedModules = [ outputs.homeManagerModules.default ]; }
] ++ modules;
in
nixpkgs.lib.nixosSystem {
modules = modsExtended;
specialArgs = {
flake = flakeArg;
};
inherit system;
};
in
{
"x13yz" = nixosSystem {
modules = [
{
# TODO check if required & hide into modules
boot = {
initrd = {
availableKernelModules = [
"nvme" # nvme (probably required for booting)
"rtsx_pci_sdmmc" # probably for SD card (required for booting?)
"xhci_pci" # for USB 3.0 (required for booting?)
];
kernelModules = [
"dm-snapshot" # pseudo-required for LVM
];
};
kernelModules = [
"kvm-intel" # do not know if that is required here?
];
};
}
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
{
# hardware
hardware.cpu.type = "intel";
hardware.graphics.intel.enable = true;
programs.captive-browser.interface = "wlp0s20f3";
}
{
# as currently installed
boot.initrd.luks.devices."luks-herske.lvm.6nw.de" = {
device = "/dev/disk/by-uuid/16b8f83d-0450-4c4d-9964-788575a31eec";
preLVM = true;
allowDiscards = true;
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/c93557db-e7c5-46ef-9cd8-87eb7c5753dc";
fsType = "ext4";
options = [
"relatime"
"discard"
];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/5F9A-9A2D";
fsType = "vfat";
options = [
"uid=0"
"gid=0"
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [ { device = "/dev/disk/by-uuid/8482463b-ceb3-40b3-abef-b49df2de88e5"; } ];
system.stateVersion = "24.05";
x-banananetwork.sshHostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG71dtqG/c0AiFBN9OxoLD35TDQm3m8LXj/BQw60PE0h root@x13yz.pc.6nw.de 2024-07-01";
}
{
# host configuration
networking.domain = "pc.6nw.de";
networking.hostName = "x13yz";
services.fprintd.enable = true;
x-banananetwork.frontend.convertable = true;
x-banananetwork.frontend.enable = true;
}
];
system = "x86_64-linux";
};
};
nixosConfigurations = importFlakeMod ./nix/nixos;
nixosModules = importFlakeMod ./nix/nixos-modules;

91
nix/nixos/default.nix
Unescape Escape View File

@ -0,0 +1,91 @@
{ inputs, outputs, ... }@flakeArg:
let
nixpkgs = inputs.nixpkgs;
nixosSystem =
{ modules, system }:
let
modsExtended = [
outputs.nixosModules.myOptions
outputs.nixosModules.withDepends
{ home-manager.sharedModules = [ outputs.homeManagerModules.default ]; }
] ++ modules;
in
nixpkgs.lib.nixosSystem {
modules = modsExtended;
specialArgs = {
flake = flakeArg;
};
inherit system;
};
in
{
"x13yz" = nixosSystem {
modules = [
{
# TODO check if required & hide into modules
boot = {
initrd = {
availableKernelModules = [
"nvme" # nvme (probably required for booting)
"rtsx_pci_sdmmc" # probably for SD card (required for booting?)
"xhci_pci" # for USB 3.0 (required for booting?)
];
kernelModules = [
"dm-snapshot" # pseudo-required for LVM
];
};
kernelModules = [
"kvm-intel" # do not know if that is required here?
];
};
}
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
{
# hardware
hardware.cpu.type = "intel";
hardware.graphics.intel.enable = true;
programs.captive-browser.interface = "wlp0s20f3";
}
{
# as currently installed
boot.initrd.luks.devices."luks-herske.lvm.6nw.de" = {
device = "/dev/disk/by-uuid/16b8f83d-0450-4c4d-9964-788575a31eec";
preLVM = true;
allowDiscards = true;
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/c93557db-e7c5-46ef-9cd8-87eb7c5753dc";
fsType = "ext4";
options = [
"relatime"
"discard"
];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/5F9A-9A2D";
fsType = "vfat";
options = [
"uid=0"
"gid=0"
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [ { device = "/dev/disk/by-uuid/8482463b-ceb3-40b3-abef-b49df2de88e5"; } ];
system.stateVersion = "24.05";
x-banananetwork.sshHostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG71dtqG/c0AiFBN9OxoLD35TDQm3m8LXj/BQw60PE0h root@x13yz.pc.6nw.de 2024-07-01";
}
{
# host configuration
networking.domain = "pc.6nw.de";
networking.hostName = "x13yz";
services.fprintd.enable = true;
x-banananetwork.frontend.convertable = true;
x-banananetwork.frontend.enable = true;
}
];
system = "x86_64-linux";
};
}
Write Preview
Loading…
Cancel
Save