modularise, combine

This commit is contained in:
andromeda
2025-12-30 00:32:23 +01:00
parent 12438a9c8d
commit 1463a81e8c
11 changed files with 684 additions and 693 deletions

View File

@@ -1,47 +1,40 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "sdhci_pci"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/6546ea32-a94f-4d2d-8949-fe5f7009bd22";
fsType = "ext4";
};
fileSystems."/" = {
device = "none";
fsType = "tmpfs";
options = ["defaults" "size=25%" "mode=755"];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/038cd71d-c0c6-4e3b-950c-2b239d67670b";
fsType = "ext4";
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/0e586651-36f4-42b0-99b3-3f0704a894d6";
fsType = "btrfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5AEC-83B7";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/F425-55BA";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/bc77f555-144f-4c8c-86cb-e2785783c49a";
fsType = "ext4";
};
fileSystems."/home/mtgmonkey/tmp" =
{ device = "/dev/mmcblk0p1";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/394f46fe-65c3-4e35-acf8-44d81ed5a674"; }
];
swapDevices = [];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;