Merge remote-tracking branch 'origin/master'

This commit is contained in:
oxapentane - 2022-07-10 22:08:03 +02:00
commit 9d52622470
Signed by: oxapentane
GPG Key ID: 91FA5E5BF9AA901C
3 changed files with 3 additions and 37 deletions

View File

@ -142,8 +142,8 @@
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
microvm.nixosModules.microvm
./hosts/data-hoarder/configuration.nix
./hosts/data-hoarder/hardware-configuration.nix
./modules/data-hoarder/wireguard_server.nix
] ++ data-hoarder-modules;
};

View File

@ -5,13 +5,6 @@
{ pkgs, ... }:
{
# Use the GRUB 2 boot loader.
#boot.loader.grub.enable = true;
#boot.loader.grub.version = 2;
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only
networking.hostName = "data-hoarder"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -27,8 +20,8 @@
];
};
networking.defaultGateway = "192.109.108.61";
networking.nameservers = [ "9.9.9.9" ];
networking.defaultGateway = "172.20.73.1";
networking.nameservers = [ "172.20.73.8" "9.9.9.9" ];
sops.defaultSopsFile = ../../secrets/data-hoarder/secrets.yaml;

View File

@ -1,27 +0,0 @@
# 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, modulesPath, ... }:
{
imports =
[
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/f986fb01-6d6b-4f9a-b9ec-bc9ba4ac8229";
fsType = "ext4";
};
swapDevices =
[{ device = "/dev/disk/by-uuid/5275b0b8-7c5d-4448-a8ea-12baf07dfed9"; }];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}