neo secrets et hardware-configuration

merge-requests/7/merge
korenstin 2024-12-07 16:59:06 +01:00 committed by RatCornu
parent f4575c4e02
commit 7e2be3f107
No known key found for this signature in database
GPG Key ID: B3BE02E379E6E8E2
1 changed files with 22 additions and 0 deletions

View File

@ -1,6 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
<<<<<<< HEAD
{ {
config, config,
lib, lib,
@ -22,14 +23,31 @@
"sd_mod" "sd_mod"
"sr_mod" "sr_mod"
]; ];
=======
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
>>>>>>> c9096a8 (neo secrets et hardware-configuration)
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
<<<<<<< HEAD
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/89589639-21f1-4899-97e9-d1de6eb16d45"; device = "/dev/disk/by-uuid/89589639-21f1-4899-97e9-d1de6eb16d45";
fsType = "ext4"; fsType = "ext4";
}; };
=======
fileSystems."/" =
{ device = "/dev/disk/by-uuid/d7e64c03-51b3-415c-8e6f-241a996b16f5";
fsType = "ext4";
};
>>>>>>> c9096a8 (neo secrets et hardware-configuration)
swapDevices = [ ]; swapDevices = [ ];
@ -43,3 +61,7 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
} }
<<<<<<< HEAD
=======
>>>>>>> c9096a8 (neo secrets et hardware-configuration)